From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 9 Oct 2014 06:18:33 +0000 (+0200)
Subject: qemu: make sure capability probing process can start
X-Git-Tag: v1.2.9.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=963d0bb5e6db0d17539897c3390a65d26fbf6980;p=thirdparty%2Flibvirt.git

qemu: make sure capability probing process can start

When daemon is killed right in the middle of probing a qemu binary for
its capabilities, the qemu process is left running.  Next time the
daemon is starting, it cannot start the probing qemu process because the
one that's already running does have the pidfile flock()'d.

Reported-by: Wang Yufei <james.wangyufei@huawei.com>

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
(cherry picked from commit 0ed1b55b20300e0ea53925349d918935c2114bf2)
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 60140b168d..668fc38f8b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3241,6 +3241,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
     config.data.nix.path = monpath;
     config.data.nix.listen = false;
 
+    virPidFileForceCleanupPath(pidfile);
+
     VIR_DEBUG("Try to get caps via QMP qemuCaps=%p", qemuCaps);
 
     /*