提交 8be3ccd0 编写于 作者: J Jiri Denemark

qemu: Properly reset all migration capabilities

So far only QEMU_MONITOR_MIGRATION_CAPS_POSTCOPY was reset, but only in
a single code path leaving post-copy enabled in quite a few cases.

https://bugzilla.redhat.com/show_bug.cgi?id=1425003Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
上级 4097de40
......@@ -5342,9 +5342,6 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
*/
if (inPostCopy)
VIR_FREE(priv->job.completed);
qemuMigrationSetPostCopy(driver, vm, false,
QEMU_ASYNC_JOB_MIGRATION_IN);
}
qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN);
......@@ -5873,9 +5870,16 @@ qemuMigrationReset(virQEMUDriverPtr driver,
virDomainObjPtr vm,
qemuDomainAsyncJob job)
{
qemuMonitorMigrationCaps cap;
if (!virDomainObjIsActive(vm))
return;
if (qemuMigrationResetTLS(driver, vm, job) < 0)
return;
for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) {
if (qemuMigrationSetOption(driver, vm, cap, false, job) < 0)
return;
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册