From 963d0bb5e6db0d17539897c3390a65d26fbf6980 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Thu, 9 Oct 2014 08:18:33 +0200 Subject: [PATCH] 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 Signed-off-by: Martin Kletzander (cherry picked from commit 0ed1b55b20300e0ea53925349d918935c2114bf2) --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) 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); /* -- GitLab