]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu_process: move qemuDomainSetPrivatePaths to qemuProcessInit
authorPavel Hrdina <phrdina@redhat.com>
Mon, 14 Mar 2016 09:31:28 +0000 (10:31 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 22 Mar 2016 14:15:48 +0000 (15:15 +0100)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_process.c

index 9cdd9d5cbab83c88d8fc2a97d0a9a6edc7ca2e1c..f7110cd81c57723d50359036ae228808bc1690d9 100644 (file)
@@ -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),