Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
aa81db3f
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aa81db3f
编写于
9月 13, 2012
作者:
O
Osier Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virsh: Fix version numbers in comments
And redundant error resetting. Pushed under trivial rule.
上级
16e41ab6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
15 deletion
+9
-15
tools/virsh-network.c
tools/virsh-network.c
+3
-5
tools/virsh-pool.c
tools/virsh-pool.c
+3
-5
tools/virsh-volume.c
tools/virsh-volume.c
+3
-5
未找到文件。
tools/virsh-network.c
浏览文件 @
aa81db3f
...
...
@@ -397,7 +397,7 @@ vshNetworkListCollect(vshControl *ctl,
int
nInactiveNets
=
0
;
int
nAllNets
=
0
;
/* try the list with flags support (0.10.
0
and later) */
/* try the list with flags support (0.10.
2
and later) */
if
((
ret
=
virConnectListAllNetworks
(
ctl
->
conn
,
&
list
->
nets
,
flags
))
>=
0
)
{
...
...
@@ -406,10 +406,8 @@ vshNetworkListCollect(vshControl *ctl,
}
/* check if the command is actually supported */
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
{
vshResetLibvirtError
();
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
goto
fallback
;
}
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_INVALID_ARG
)
{
/* try the new API again but mask non-guaranteed flags */
...
...
@@ -430,7 +428,7 @@ vshNetworkListCollect(vshControl *ctl,
fallback:
/* fall back to old method (0.
9.13
and older) */
/* fall back to old method (0.
10.1
and older) */
vshResetLibvirtError
();
/* Get the number of active networks */
...
...
tools/virsh-pool.c
浏览文件 @
aa81db3f
...
...
@@ -606,7 +606,7 @@ vshStoragePoolListCollect(vshControl *ctl,
int
nInactivePools
=
0
;
int
nAllPools
=
0
;
/* try the list with flags support (0.10.
0
and later) */
/* try the list with flags support (0.10.
2
and later) */
if
((
ret
=
virConnectListAllStoragePools
(
ctl
->
conn
,
&
list
->
pools
,
flags
))
>=
0
)
{
...
...
@@ -615,10 +615,8 @@ vshStoragePoolListCollect(vshControl *ctl,
}
/* check if the command is actually supported */
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
{
vshResetLibvirtError
();
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
goto
fallback
;
}
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_INVALID_ARG
)
{
/* try the new API again but mask non-guaranteed flags */
...
...
@@ -638,7 +636,7 @@ vshStoragePoolListCollect(vshControl *ctl,
fallback:
/* fall back to old method (0.
9.13
and older) */
/* fall back to old method (0.
10.1
and older) */
vshResetLibvirtError
();
/* There is no way to get the pool type */
...
...
tools/virsh-volume.c
浏览文件 @
aa81db3f
...
...
@@ -1017,7 +1017,7 @@ vshStorageVolListCollect(vshControl *ctl,
int
nvols
=
0
;
int
ret
=
-
1
;
/* try the list with flags support (0.10.
0
and later) */
/* try the list with flags support (0.10.
2
and later) */
if
((
ret
=
virStoragePoolListAllVolumes
(
pool
,
&
list
->
vols
,
flags
))
>=
0
)
{
...
...
@@ -1026,17 +1026,15 @@ vshStorageVolListCollect(vshControl *ctl,
}
/* check if the command is actually supported */
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
{
vshResetLibvirtError
();
if
(
last_error
&&
last_error
->
code
==
VIR_ERR_NO_SUPPORT
)
goto
fallback
;
}
/* there was an error during the call */
vshError
(
ctl
,
"%s"
,
_
(
"Failed to list volumes"
));
goto
cleanup
;
fallback:
/* fall back to old method (0.
9.13
and older) */
/* fall back to old method (0.
10.1
and older) */
vshResetLibvirtError
();
/* Determine the number of volumes in the pool */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录