External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: use vshError rather than vshPrint on failure

Browse Source 
There were a few places in our virsh* code where instead of calling vshError
on failure we called vshPrint.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2016-11-04 15:21:31 +01:00
parent 5805492002
commit 53525f914d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh-domain.c
View File

@ -2099,7 +2099,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd)
break; break;
case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_FAILED:
vshPrint(ctl, "\n%s", _("Commit failed")); vshError(ctl, "\n%s", _("Commit failed"));
goto cleanup; goto cleanup;
break; break;
@ -2408,7 +2408,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd)
break; break;
case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_FAILED:
vshPrint(ctl, "\n%s", _("Copy failed")); vshError(ctl, "\n%s", _("Copy failed"));
goto cleanup; goto cleanup;
break; break;
@ -2818,7 +2818,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd)
break; break;
case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_FAILED:
vshPrint(ctl, "\n%s", _("Pull failed")); vshError(ctl, "\n%s", _("Pull failed"));
goto cleanup; goto cleanup;
break; break;
@ -3794,7 +3794,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
virStoragePoolPtr storagepool = NULL; virStoragePoolPtr storagepool = NULL;
if (!source) { if (!source) {
vshPrint(ctl, vshError(ctl,
_("Missing storage volume name for disk '%s'"), _("Missing storage volume name for disk '%s'"),
target); target);
continue; continue;
@ -3802,7 +3802,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
if (!(storagepool = virStoragePoolLookupByName(priv->conn, if (!(storagepool = virStoragePoolLookupByName(priv->conn,
pool))) { pool))) {
vshPrint(ctl, vshError(ctl,
_("Storage pool '%s' for volume '%s' not found."), _("Storage pool '%s' for volume '%s' not found."),
pool, target); pool, target);
vshResetLibvirtError(); vshResetLibvirtError();
@ -3817,7 +3817,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd)
} }
if (!vol.vol) { if (!vol.vol) {
vshPrint(ctl, vshError(ctl,
_("Storage volume '%s'(%s) is not managed by libvirt. " _("Storage volume '%s'(%s) is not managed by libvirt. "
"Remove it manually.\n"), target, source); "Remove it manually.\n"), target, source);
vshResetLibvirtError(); vshResetLibvirtError();

2
tools/virsh-volume.c
View File

@ -605,7 +605,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd)
newxml = virshMakeCloneXML(origxml, name); newxml = virshMakeCloneXML(origxml, name);
if (!newxml) { if (!newxml) {
vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); vshError(ctl, "%s", _("Failed to allocate XML buffer"));
goto cleanup; goto cleanup;
} }

4
tools/vsh.c
View File

@ -3267,7 +3267,7 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd)
if (xml) { if (xml) {
virBufferEscapeString(&xmlbuf, "%s", arg); virBufferEscapeString(&xmlbuf, "%s", arg);
if (virBufferError(&xmlbuf)) { if (virBufferError(&xmlbuf)) {
vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); vshError(ctl, "%s", _("Failed to allocate XML buffer"));
return false; return false;
} }
str = virBufferContentAndReset(&xmlbuf); str = virBufferContentAndReset(&xmlbuf);
@ -3284,7 +3284,7 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd)
} }
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); vshError(ctl, "%s", _("Failed to allocate XML buffer"));
return false; return false;
} }
arg = virBufferContentAndReset(&buf); arg = virBufferContentAndReset(&buf);