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

qemu: process: Reorder operations on early VM startup 

Retrieval of the driver capabilities as well as emulator capabilities
does not require the complete qemuProcessStop to be executed on
failure.
This commit is contained in:
Peter Krempa 2016-02-04 14:48:57 +01:00
parent 4f1324aa48
commit c3e170647e
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

@ -4432,7 +4432,14 @@ qemuProcessInit(virQEMUDriverPtr driver,
}
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto stop;
goto cleanup;
VIR_DEBUG("Determining emulator version");
virObjectUnref(priv->qemuCaps);
if (!(priv->qemuCaps = virQEMUCapsCacheLookupCopy(driver->qemuCapsCache,
vm->def->emulator,
vm->def->os.machine)))
goto cleanup;
/* Some things, paths, ... are generated here and we want them to persist.
* Fill them in prior to setting the domain def as transient. */
@ -4462,13 +4469,6 @@ qemuProcessInit(virQEMUDriverPtr driver,
VIR_HOOK_SUBOP_BEGIN) < 0)
goto stop;
VIR_DEBUG("Determining emulator version");
virObjectUnref(priv->qemuCaps);
if (!(priv->qemuCaps = virQEMUCapsCacheLookupCopy(driver->qemuCapsCache,
vm->def->emulator,
vm->def->os.machine)))
goto stop;
ret = 0;
cleanup: