From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 26 Sep 2012 14:46:47 +0000 (+0100)
Subject: Don't skip over socket label cleanup
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0b62c0736a2a365b9c682d58fa9f66eaea6ec7e4;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

Don't skip over socket label cleanup

If QEMU quits immediately after we opened the monitor it was
possible we would skip the clearing of the SELinux process
socket context

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 70b72afa0..ade64b731 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1242,12 +1242,11 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm)
     virDomainObjLock(vm);
     priv->monStart = 0;
 
-    if (mon == NULL)
+    if (mon == NULL) {
         virObjectUnref(vm);
-
-    if (!virDomainObjIsActive(vm)) {
+    } else if (!virDomainObjIsActive(vm)) {
         qemuMonitorClose(mon);
-        goto error;
+        mon = NULL;
     }
     priv->mon = mon;