提交 aa81db3f 编写于 作者: O Osier Yang

virsh: Fix version numbers in comments

And redundant error resetting.

Pushed under trivial rule.
上级 16e41ab6
......@@ -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 */
......
......@@ -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 */
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册