From: Eric Blake <eblake@redhat.com>
Date: Tue, 15 Feb 2011 16:31:39 +0000 (-0700)
Subject: qemu: don't mask real error with oom report
X-Git-Tag: v0.8.8~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56152be57887cfc9a92d4fbb0c81f024664ddb46;p=thirdparty%2Flibvirt.git

qemu: don't mask real error with oom report

* src/qemu/qemu_command.c (qemuBuildCommandLine): Don't report oom
after qemuBuildControllerDevStr, which reported its own errors.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1687203245..d9af829137 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3102,7 +3102,7 @@ qemuBuildCommandLine(virConnectPtr conn,
 
             char *devstr;
             if (!(devstr = qemuBuildControllerDevStr(def->controllers[i], qemuCmdFlags)))
-                goto no_memory;
+                goto error;
 
             virCommandAddArg(cmd, devstr);
             VIR_FREE(devstr);