提交 26edd68c 编写于 作者: J Jiri Denemark

qemu: Start job in qemuDomainDestroyFlags early

Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
上级 4d0c535a
...@@ -2274,11 +2274,6 @@ qemuDomainDestroyFlags(virDomainPtr dom, ...@@ -2274,11 +2274,6 @@ qemuDomainDestroyFlags(virDomainPtr dom,
if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
qemuDomainSetFakeReboot(driver, vm, false);
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY, if (qemuProcessBeginStopJob(driver, vm, QEMU_JOB_DESTROY,
!(flags & VIR_DOMAIN_DESTROY_GRACEFUL)) < 0) !(flags & VIR_DOMAIN_DESTROY_GRACEFUL)) < 0)
goto cleanup; goto cleanup;
...@@ -2289,6 +2284,11 @@ qemuDomainDestroyFlags(virDomainPtr dom, ...@@ -2289,6 +2284,11 @@ qemuDomainDestroyFlags(virDomainPtr dom,
goto endjob; goto endjob;
} }
qemuDomainSetFakeReboot(driver, vm, false);
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, stopFlags); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, stopFlags);
event = virDomainEventLifecycleNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册