From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 27 Jan 2011 18:28:15 +0000 (+0000)
Subject: Remove double close of qemu monitor
X-Git-Tag: v0.8.8~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e85247e7c3a9ee2697b49ca5bbcabd3d2d493f95;p=thirdparty%2Flibvirt.git

Remove double close of qemu monitor

When qemuMonitorSetCapabilities() fails, there is no need to
call qemuMonitorClose(), because the caller will already see
the error code and tear down the entire VM. The extra call to
qemuMonitorClose resulted in a double-free due to it removing
a ref count prematurely.

* src/qemu/qemu_driver.c: Remove premature close of monitor
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3d2ba0d443..35e1cd77aa 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -900,8 +900,6 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm)
     qemuDomainObjExitMonitorWithDriver(driver, vm);
 
 error:
-    if (ret < 0)
-        qemuMonitorClose(priv->mon);
 
     return ret;
 }