From 038cffd831e9c0a82624d6f95e795a68a9d255e4 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 7 Jan 2013 16:18:33 +0000 Subject: [PATCH] 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. --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. -- GitLab