From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 7 Jan 2013 16:18:33 +0000 (+0000)
Subject: Only initialize capabilities after setting dir permissions
X-Git-Tag: v1.0.2-rc1~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=038cffd831e9c0a82624d6f95e795a68a9d255e4;p=thirdparty%2Flibvirt.git

Only initialize capabilities after setting dir permissions

The current code is initializing capabilities before setting
directory permissions. Thus the QEMU binaries being run may
not have the ability to create the UNIX monitor socket on
the first run of libvirtd.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b857892039..06b0d28efb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -831,9 +831,6 @@ qemuStartup(bool privileged,
     if (!qemu_driver->capsCache)
         goto error;
 
-    if ((qemu_driver->caps = qemuCreateCapabilities(qemu_driver)) == NULL)
-        goto error;
-
     if ((qemu_driver->activePciHostdevs = pciDeviceListNew()) == NULL)
         goto error;
 
@@ -873,6 +870,9 @@ qemuStartup(bool privileged,
         }
     }
 
+    if ((qemu_driver->caps = qemuCreateCapabilities(qemu_driver)) == NULL)
+        goto error;
+
     /* If hugetlbfs is present, then we need to create a sub-directory within
      * it, since we can't assume the root mount point has permissions that
      * will let our spawned QEMU instances use it.