Move code for setting paths and prepping file system from
qemuProcessQMPNew to qemuProcessQMPInit.
This keeps qemuProcessQMPNew limited to data structures
and path initialization is done in qemuProcessQMPInit.
The patch is a non-functional, cut / paste change,
however goto is now "cleanup" rather than "error".
Signed-off-by: Chris Venteicher <cvent...@redhat.com>
---
src/qemu/qemu_process.c | 44 +++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dc2237f0e6..430136251d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8240,14 +8240,33 @@ qemuProcessQMPNew(const char *binary,
proc->runGid = runGid;
proc->forceTCG = forceTCG;
+ return proc;
+
+ error:
+ qemuProcessQMPFree(proc);
+ return NULL;
+}
+
+
+/* Initialize configuration and paths prior to starting QEMU
+ */
+static int
+qemuProcessQMPInit(qemuProcessQMPPtr proc)
+{
+ int ret = -1;
+
+ VIR_DEBUG("proc=%p, emulator=%s",
+ proc, proc->binary);
+
/* the ".sock" sufix is important to avoid a possible clash with a qemu
* domain called "capabilities"
*/
if (virAsprintf(&proc->monpath, "%s/%s", proc->libDir,
"capabilities.monitor.sock") < 0)
- goto error;
+ goto cleanup;
+
if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath) < 0)
- goto error;
+ goto cleanup;
/* ".pidfile" suffix is used rather than ".pid" to avoid a possible clash
* with a qemu domain called "capabilities"
@@ -8256,30 +8275,13 @@ qemuProcessQMPNew(const char *binary,
* than libvirtd. So we're using libDir which QEMU can write to
*/
if (virAsprintf(&proc->pidfile, "%s/%s", proc->libDir,
"capabilities.pidfile") < 0)
- goto error;
+ goto cleanup;
virPidFileForceCleanupPath(proc->pidfile);
- return proc;
-
- error:
- qemuProcessQMPFree(proc);
- return NULL;
-}
-
-
-/* Initialize configuration and paths prior to starting QEMU
- */
-static int
-qemuProcessQMPInit(qemuProcessQMPPtr proc)
-{
- int ret = -1;
-
- VIR_DEBUG("proc=%p, emulator=%s",
- proc, proc->binary);
-
ret = 0;
+ cleanup:
VIR_DEBUG("ret=%i", ret);
return ret;
}
--
2.17.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
