From 0ed1b55b20300e0ea53925349d918935c2114bf2 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 --- 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 b6c0f1b06e..ec6614a68f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3243,6 +3243,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