From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 18 Jan 2011 18:00:31 +0000 (+0000)
Subject: Fix error reporting when machine type probe fails
X-Git-Tag: v0.8.8~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0bbf960474b75c0323a3c989835a44d30bc9e7f;p=thirdparty%2Flibvirt.git

Fix error reporting when machine type probe fails

Avoid overwriting the real error message with a generic
OOM failure message, when machine type probe fails

* src/qemu/qemu_driver.c: Don't overwrite error
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 012ce5d67e..5206b6045f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6256,10 +6256,8 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical)
     virCapsGuestMachinePtr *machines = NULL;
     int i, nmachines = 0;
 
-    if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0) {
-        virReportOOMError();
+    if (qemuCapsProbeMachineTypes(def->emulator, &machines, &nmachines) < 0)
         return -1;
-    }
 
     for (i = 0; i < nmachines; i++) {
         if (!machines[i]->canonical)