[libvirt] [PATCH] 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. --- src/qemu/qemu_command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3ba0950..63d5edc 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); -- 1.7.4
On 02/15/2011 11:32 AM, Eric Blake wrote:
* src/qemu/qemu_command.c (qemuBuildCommandLine): Don't report oom after qemuBuildControllerDevStr, which reported its own errors. --- src/qemu/qemu_command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3ba0950..63d5edc 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);
ACK.
On 02/15/2011 10:37 AM, Laine Stump wrote:
On 02/15/2011 11:32 AM, Eric Blake wrote:
* src/qemu/qemu_command.c (qemuBuildCommandLine): Don't report oom after qemuBuildControllerDevStr, which reported its own errors. --- src/qemu/qemu_command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3ba0950..63d5edc 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);
ACK.
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Laine Stump