]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't fail hard when we can't connect to the monitor
authorGuido Günther <agx@sigxcpu.org>
Thu, 29 Nov 2012 12:08:40 +0000 (13:08 +0100)
committerGuido Günther <agx@sigxcpu.org>
Thu, 29 Nov 2012 12:54:44 +0000 (13:54 +0100)
As of 1a50ba2cb07d8bb2aa724062889deb9efd7ad9e9 we fail to connect to the
monitor instead of getting an exit status != 0 from qemu itself.  This
breaks capabilities probing for the non QMP case.

src/qemu/qemu_capabilities.c

index d92947f7da304d9c60bd32e1812ea967e033e5a0..d6affb97219fa90755fa565cb1700c445ade43f9 100644 (file)
@@ -2345,8 +2345,10 @@ qemuCapsInitQMP(qemuCapsPtr caps,
         goto cleanup;
     }
 
-    if (!(mon = qemuMonitorOpen(NULL, &config, true, &callbacks)))
+    if (!(mon = qemuMonitorOpen(NULL, &config, true, &callbacks))) {
+        ret = 0;
         goto cleanup;
+    }
 
     qemuMonitorLock(mon);