diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 184f64dd59..a4f7eb1556 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2099,7 +2099,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) break; case VIR_DOMAIN_BLOCK_JOB_FAILED: - vshPrint(ctl, "\n%s", _("Commit failed")); + vshError(ctl, "\n%s", _("Commit failed")); goto cleanup; break; @@ -2408,7 +2408,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) break; case VIR_DOMAIN_BLOCK_JOB_FAILED: - vshPrint(ctl, "\n%s", _("Copy failed")); + vshError(ctl, "\n%s", _("Copy failed")); goto cleanup; break; @@ -2818,7 +2818,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) break; case VIR_DOMAIN_BLOCK_JOB_FAILED: - vshPrint(ctl, "\n%s", _("Pull failed")); + vshError(ctl, "\n%s", _("Pull failed")); goto cleanup; break; @@ -3794,7 +3794,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) virStoragePoolPtr storagepool = NULL; if (!source) { - vshPrint(ctl, + vshError(ctl, _("Missing storage volume name for disk '%s'"), target); continue; @@ -3802,7 +3802,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!(storagepool = virStoragePoolLookupByName(priv->conn, pool))) { - vshPrint(ctl, + vshError(ctl, _("Storage pool '%s' for volume '%s' not found."), pool, target); vshResetLibvirtError(); @@ -3817,7 +3817,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } if (!vol.vol) { - vshPrint(ctl, + vshError(ctl, _("Storage volume '%s'(%s) is not managed by libvirt. " "Remove it manually.\n"), target, source); vshResetLibvirtError(); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index e8cef395b7..8831f44d0d 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -605,7 +605,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) newxml = virshMakeCloneXML(origxml, name); if (!newxml) { - vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); + vshError(ctl, "%s", _("Failed to allocate XML buffer")); goto cleanup; } diff --git a/tools/vsh.c b/tools/vsh.c index 07ceb7bf5f..f94eaa33d3 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3267,7 +3267,7 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) if (xml) { virBufferEscapeString(&xmlbuf, "%s", arg); if (virBufferError(&xmlbuf)) { - vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); + vshError(ctl, "%s", _("Failed to allocate XML buffer")); return false; } str = virBufferContentAndReset(&xmlbuf); @@ -3284,7 +3284,7 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) } if (virBufferError(&buf)) { - vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); + vshError(ctl, "%s", _("Failed to allocate XML buffer")); return false; } arg = virBufferContentAndReset(&buf);