forked from rpms/libvirt
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
|
From 2a05454cd2d6ba283c128158f44d84d65832ebf7 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <2a05454cd2d6ba283c128158f44d84d65832ebf7@dist-git>
|
||
|
|
From: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Date: Thu, 21 Jul 2022 16:49:09 +0200
|
||
|
|
Subject: [PATCH] qemu_migration_params: Refactor qemuMigrationParamsReset
|
||
|
|
|
||
|
|
Because qemuMigrationParamsReset used to call qemuMigrationParamsApply
|
||
|
|
for resetting migration capabilities and parameters, it did not work
|
||
|
|
well since commit v5.1.0-83-ga1dec315c9 which only allowed capabilities
|
||
|
|
to be set from an async job. However, when reconnecting to running
|
||
|
|
domains after daemon restart we do not have an async job. Thus the
|
||
|
|
capabilities were not properly reset in case the daemon was restarted
|
||
|
|
during an ongoing migration. We need to avoid calling
|
||
|
|
qemuMigrationParamsApply to make sure both parameters and capabilities
|
||
|
|
can be reset by a normal job.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=2107892
|
||
|
|
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
(cherry picked from commit c47f1abb81194461377a0c608a7ecd87f9ce9146)
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_migration_params.c | 14 +++++++++-----
|
||
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
|
||
|
|
index 7b9e5453f6..4a824ff5e1 100644
|
||
|
|
--- a/src/qemu/qemu_migration_params.c
|
||
|
|
+++ b/src/qemu/qemu_migration_params.c
|
||
|
|
@@ -1290,6 +1290,7 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
|
||
|
|
unsigned long apiFlags)
|
||
|
|
{
|
||
|
|
virErrorPtr err;
|
||
|
|
+ g_autoptr(virBitmap) clearCaps = NULL;
|
||
|
|
|
||
|
|
virErrorPreserveLast(&err);
|
||
|
|
|
||
|
|
@@ -1299,13 +1300,16 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
|
||
|
|
if (!virDomainObjIsActive(vm) || !origParams)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
- /* Do not pass apiFlags to qemuMigrationParamsApply here to make sure all
|
||
|
|
- * parameters and capabilities are reset. */
|
||
|
|
- if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams, 0) < 0)
|
||
|
|
+ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
- qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
|
||
|
|
- /* We don't reset 'block-bitmap-mapping' as it can't be unset */
|
||
|
|
+ clearCaps = virBitmapNew(0);
|
||
|
|
+
|
||
|
|
+ if (qemuMigrationParamsApplyCaps(vm, clearCaps) == 0 &&
|
||
|
|
+ qemuMigrationParamsApplyValues(vm, origParams, false) == 0)
|
||
|
|
+ qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
|
||
|
|
+
|
||
|
|
+ qemuDomainObjExitMonitor(vm);
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
virErrorRestore(&err);
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|