[libvirt] [PATCH v6 06/33] qemu_capabilities: Stop QEMU process before freeing
virQEMUCapsInitQMP now stops QEMU process in all execution paths,
before freeing the process structure.
The qemuProcessQMPStop function can be called multiple times without
problems... Won't attempt to stop processes and free resources multiple
times.
Follow the convention established in qemu_process of
1) alloc process structure
2) start process
3) use process
4) stop process
5) free process data structure
The process data structure persists after the process activation fails
or the process dies or is killed so stderr strings can be retrieved
until the process data structure is freed.
Signed-off-by: Chris Venteicher <cventeic(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 1 +
src/qemu/qemu_process.c | 22 +++++++++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2bacd5e40a..73380fdc2b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4391,6 +4391,7 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps,
ret = 0;
cleanup:
+ qemuProcessQMPStop(proc);
qemuProcessQMPFree(proc);
return ret;
}
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2ab1319ab9..2208ff72b2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8359,14 +8359,20 @@ qemuProcessQMPRun(qemuProcessQMPPtr proc,
void
qemuProcessQMPStop(qemuProcessQMPPtr proc)
{
- if (proc->mon)
+ if (!proc)
+ return;
+
+ if (proc->mon) {
virObjectUnlock(proc->mon);
- qemuMonitorClose(proc->mon);
- proc->mon = NULL;
+ qemuMonitorClose(proc->mon);
+ proc->mon = NULL;
+ }
- virCommandAbort(proc->cmd);
- virCommandFree(proc->cmd);
- proc->cmd = NULL;
+ if (proc->cmd) {
+ virCommandAbort(proc->cmd);
+ virCommandFree(proc->cmd);
+ proc->cmd = NULL;
+ }
if (proc->monpath)
unlink(proc->monpath);
@@ -8383,8 +8389,10 @@ qemuProcessQMPStop(qemuProcessQMPPtr proc)
virStrerror(errno, ebuf, sizeof(ebuf)));
VIR_FREE(*proc->qmperr);
+
+ proc->pid = 0;
}
+
if (proc->pidfile)
unlink(proc->pidfile);
- proc->pid = 0;
}
--
2.17.1