From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 14 Mar 2016 09:31:28 +0000 (+0100)
Subject: qemu_process: move qemuDomainSetPrivatePaths to qemuProcessInit
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6e8266ade5ba8ce3a5a010dac9160f6fbeefcfaf;p=libvirt.git

qemu_process: move qemuDomainSetPrivatePaths to qemuProcessInit

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 9cdd9d5cba..f7110cd81c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4542,6 +4542,14 @@ qemuProcessInit(virQEMUDriverPtr driver,
                              VIR_HOOK_SUBOP_BEGIN) < 0)
         goto stop;
 
+    if (qemuDomainSetPrivatePaths(&priv->libDir,
+                                  &priv->channelTargetDir,
+                                  cfg->libDir,
+                                  cfg->channelTargetDir,
+                                  vm->def->name,
+                                  vm->def->id) < 0)
+        goto cleanup;
+
     ret = 0;
 
  cleanup:
@@ -5148,14 +5156,6 @@ qemuProcessLaunch(virConnectPtr conn,
         goto cleanup;
     logfile = qemuDomainLogContextGetWriteFD(logCtxt);
 
-    if (qemuDomainSetPrivatePaths(&priv->libDir,
-                                  &priv->channelTargetDir,
-                                  cfg->libDir,
-                                  cfg->channelTargetDir,
-                                  vm->def->name,
-                                  vm->def->id) < 0)
-        goto cleanup;
-
     VIR_DEBUG("Building emulator command line");
     if (!(cmd = qemuBuildCommandLine(conn, driver,
                                      qemuDomainLogContextGetManager(logCtxt),