diff options
| author |   Alex Jia <ajia@redhat.com> | 2012-08-27 13:58:46 +0800 |
|---|---|---|
| committer | Alex Jia <ajia@redhat.com> | 2012-08-27 14:35:38 +0800 |
| commit | 34c5ab9566b901abcdba00f62ff41fd0857e8833 (patch) | |
| tree | 16aafb867805d5ae39bd3b5465efc8d56faeb1d8 | |
| parent | specfile: require libnl3 for Fedora >= 18 and RHEL >= 7 (diff) | |
| download | libvirt-34c5ab9566b901abcdba00f62ff41fd0857e8833.tar.gz libvirt-34c5ab9566b901abcdba00f62ff41fd0857e8833.tar.bz2 libvirt-34c5ab9566b901abcdba00f62ff41fd0857e8833.zip | |
virsh: fix missing return value
Although virsh command raises a correct error information, the command status
returns 0(true), this patch is used for fixing this issue.
Signed-off-by: Alex Jia <ajia@redhat.com>
| -rw-r--r-- | tools/virsh-host.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/virsh-host.c b/tools/virsh-host.c index da6089518..2f3b41399 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -701,11 +701,13 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) judge = vshCommandOptInt(cmd, "timeout", &timeout); if (judge < 0) { vshError(ctl, "%s", _("timeout number has to be a number")); + goto cleanup; } else if (judge > 0) { judge = 1; } if (judge && timeout < 1) { vshError(ctl, "%s", _("timeout must be positive")); + goto cleanup; } if (vshCommandOptBool(cmd, "async")) { @@ -719,6 +721,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) if (judge > 1) { vshError(ctl, "%s", _("timeout, async and block options are exclusive")); + goto cleanup; } result = virDomainQemuAgentCommand(dom, guest_agent_cmd, timeout, flags); |