]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix error reporting when machine type probe fails
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 18 Jan 2011 18:00:31 +0000 (18:00 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 21 Jan 2011 16:08:28 +0000 (16:08 +0000)
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

src/qemu/qemu_driver.c

index 012ce5d67e35dc770ed6b913e7a7508d8aa3c655..5206b6045f6f7fb6e5f2a6dfc6fe4f7153c9b9bc 100644 (file)
@@ -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)