openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu_process: move qemuDomainSetPrivatePaths to qemuProcessInit 

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-03-14 10:31:28 +01:00
parent 1e38ef728c
commit 6e8266ade5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_process.c
View File

@ -4542,6 +4542,14 @@ qemuProcessInit(virQEMUDriverPtr driver,
VIR_HOOK_SUBOP_BEGIN) < 0) VIR_HOOK_SUBOP_BEGIN) < 0)
goto stop; goto stop;
if (qemuDomainSetPrivatePaths(&priv->libDir,
&priv->channelTargetDir,
cfg->libDir,
cfg->channelTargetDir,
vm->def->name,
vm->def->id) < 0)
goto cleanup;
ret = 0; ret = 0;
cleanup: cleanup:
@ -5148,14 +5156,6 @@ qemuProcessLaunch(virConnectPtr conn,
goto cleanup; goto cleanup;
logfile = qemuDomainLogContextGetWriteFD(logCtxt); 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"); VIR_DEBUG("Building emulator command line");
if (!(cmd = qemuBuildCommandLine(conn, driver, if (!(cmd = qemuBuildCommandLine(conn, driver,
qemuDomainLogContextGetManager(logCtxt), qemuDomainLogContextGetManager(logCtxt),