提交 c3e17064 编写于 作者: P Peter Krempa

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.
上级 4f1324aa
...@@ -4432,7 +4432,14 @@ qemuProcessInit(virQEMUDriverPtr driver, ...@@ -4432,7 +4432,14 @@ qemuProcessInit(virQEMUDriverPtr driver,
} }
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) 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. /* Some things, paths, ... are generated here and we want them to persist.
* Fill them in prior to setting the domain def as transient. */ * Fill them in prior to setting the domain def as transient. */
...@@ -4462,13 +4469,6 @@ qemuProcessInit(virQEMUDriverPtr driver, ...@@ -4462,13 +4469,6 @@ qemuProcessInit(virQEMUDriverPtr driver,
VIR_HOOK_SUBOP_BEGIN) < 0) VIR_HOOK_SUBOP_BEGIN) < 0)
goto stop; 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; ret = 0;
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册