b7fbd568b2
- kvm-migration-Move-yank-outside-qemu_start_incoming_migr.patch [bz#1974683] - kvm-migration-Allow-reset-of-postcopy_recover_triggered-.patch [bz#1974683] - kvm-Remove-RHEL-7.0.0-machine-type.patch [bz#1968519] - kvm-Remove-RHEL-7.1.0-machine-type.patch [bz#1968519] - kvm-Remove-RHEL-7.2.0-machine-type.patch [bz#1968519] - kvm-Remove-RHEL-7.3.0-machine-types.patch [bz#1968519] - kvm-Remove-RHEL-7.4.0-machine-types.patch [bz#1968519] - kvm-Remove-RHEL-7.5.0-machine-types.patch [bz#1968519] - kvm-acpi-pc-revert-back-to-v5.2-PCI-slot-enumeration.patch [bz#1957194] - kvm-migration-failover-reset-partially_hotplugged.patch [bz#1957194] - kvm-hmp-Fix-loadvm-to-resume-the-VM-on-success-instead-o.patch [bz#1957194] - kvm-migration-Move-bitmap_mutex-out-of-migration_bitmap_.patch [bz#1957194] - kvm-i386-cpu-Expose-AVX_VNNI-instruction-to-guest.patch [bz#1957194] - kvm-ratelimit-protect-with-a-mutex.patch [bz#1957194] - kvm-Update-Linux-headers-to-5.13-rc4.patch [bz#1957194] - kvm-i386-Add-ratelimit-for-bus-locks-acquired-in-guest.patch [bz#1957194] - kvm-iothread-generalize-iothread_set_param-iothread_get_.patch [bz#1957194] - kvm-iothread-add-aio-max-batch-parameter.patch [bz#1957194] - kvm-linux-aio-limit-the-batch-size-using-aio-max-batch-p.patch [bz#1957194] - kvm-block-nvme-Fix-VFIO_MAP_DMA-failed-No-space-left-on-.patch [bz#1957194] - kvm-migration-move-wait-unplug-loop-to-its-own-function.patch [bz#1957194] - kvm-migration-failover-continue-to-wait-card-unplug-on-e.patch [bz#1957194] - kvm-aarch64-Add-USB-storage-devices.patch [bz#1957194] - kvm-iotests-Improve-and-rename-test-291-to-qemu-img-bitm.patch [bz#1957194] - kvm-qemu-img-Fail-fast-on-convert-bitmaps-with-inconsist.patch [bz#1957194] - kvm-qemu-img-Add-skip-broken-bitmaps-for-convert-bitmaps.patch [bz#1957194] - kvm-audio-Never-send-migration-section.patch [bz#1957194] - kvm-pc-bios-s390-ccw-bootmap-Silence-compiler-warning-fr.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Use-reset_psw-pointer-instead-of-ha.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-netboot-Use-Wl-prefix-to-pass-param.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Silence-warning-from-Clang-by-marki.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Fix-the-cc-option-macro-in-the-Make.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Silence-GCC-11-stringop-overflow-wa.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Allow-building-with-Clang-too.patch [bz#1939509 bz#1940132] - kvm-pc-bios-s390-ccw-Fix-inline-assembly-for-older-versi.patch [bz#1939509 bz#1940132] - kvm-configure-Fix-endianess-test-with-LTO.patch [bz#1939509 bz#1940132] - kvm-spec-Switch-toolchain-to-Clang-LLVM.patch [bz#1939509 bz#1940132] - kvm-spec-Use-safe-stack-for-x86_64.patch [bz#1939509 bz#1940132] - kvm-spec-Reenable-write-support-for-VMDK-etc.-in-tools.patch [bz#1989841] - Resolves: bz#1974683 (Fail to set migrate incoming for 2nd time after the first time failed) - Resolves: bz#1968519 (Remove all the old 7.0-7.5 machine types) - Resolves: bz#1957194 (Synchronize RHEL-AV 8.5.0 changes to RHEL 9.0.0 Beta) - Resolves: bz#1939509 (QEMU: enable SafeStack) - Resolves: bz#1940132 (QEMU: switch build toolchain to Clang/LLVM) - Resolves: bz#1989841 (RFE: qemu-img cannot convert images into vmdk and vpc formats)
119 lines
4.5 KiB
Diff
119 lines
4.5 KiB
Diff
From e9848f4a4f45960bff1a2a7bc4a4670670de37a5 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Wed, 4 Aug 2021 07:10:12 -0400
|
|
Subject: [PATCH 21/39] migration: move wait-unplug loop to its own function
|
|
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-MergeRequest: 32: Synchronize with RHEL-AV 8.5 release 27 to RHEL 9
|
|
RH-Commit: [13/15] ab3f26a86e4ea955678323608512e54af2a7c83b (mrezanin/centos-src-qemu-kvm)
|
|
RH-Bugzilla: 1957194
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
|
The loop is used in migration_thread() and bg_migration_thread(),
|
|
so we can move it to its own function and call it from these both places.
|
|
|
|
Moreover, in migration_thread() we have a wrong state transition from
|
|
SETUP to ACTIVE while state could be WAIT_UNPLUG. This is correctly
|
|
managed in bg_migration_thread() so use this code instead.
|
|
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Message-Id: <20210629155007.629086-2-lvivier@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
(cherry picked from commit fde93d99d9c208c07e2dcc24cd04e824d2b65b35)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
migration/migration.c | 54 +++++++++++++++++++++----------------------
|
|
1 file changed, 26 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
|
index 9cf1cde39d..58df1dac05 100644
|
|
--- a/migration/migration.c
|
|
+++ b/migration/migration.c
|
|
@@ -3681,6 +3681,28 @@ bool migration_rate_limit(void)
|
|
return urgent;
|
|
}
|
|
|
|
+/*
|
|
+ * if failover devices are present, wait they are completely
|
|
+ * unplugged
|
|
+ */
|
|
+
|
|
+static void qemu_savevm_wait_unplug(MigrationState *s, int old_state,
|
|
+ int new_state)
|
|
+{
|
|
+ if (qemu_savevm_state_guest_unplug_pending()) {
|
|
+ migrate_set_state(&s->state, old_state, MIGRATION_STATUS_WAIT_UNPLUG);
|
|
+
|
|
+ while (s->state == MIGRATION_STATUS_WAIT_UNPLUG &&
|
|
+ qemu_savevm_state_guest_unplug_pending()) {
|
|
+ qemu_sem_timedwait(&s->wait_unplug_sem, 250);
|
|
+ }
|
|
+
|
|
+ migrate_set_state(&s->state, MIGRATION_STATUS_WAIT_UNPLUG, new_state);
|
|
+ } else {
|
|
+ migrate_set_state(&s->state, old_state, new_state);
|
|
+ }
|
|
+}
|
|
+
|
|
/*
|
|
* Master migration thread on the source VM.
|
|
* It drives the migration and pumps the data down the outgoing channel.
|
|
@@ -3727,22 +3749,10 @@ static void *migration_thread(void *opaque)
|
|
|
|
qemu_savevm_state_setup(s->to_dst_file);
|
|
|
|
- if (qemu_savevm_state_guest_unplug_pending()) {
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
|
- MIGRATION_STATUS_WAIT_UNPLUG);
|
|
-
|
|
- while (s->state == MIGRATION_STATUS_WAIT_UNPLUG &&
|
|
- qemu_savevm_state_guest_unplug_pending()) {
|
|
- qemu_sem_timedwait(&s->wait_unplug_sem, 250);
|
|
- }
|
|
-
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_WAIT_UNPLUG,
|
|
- MIGRATION_STATUS_ACTIVE);
|
|
- }
|
|
+ qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP,
|
|
+ MIGRATION_STATUS_ACTIVE);
|
|
|
|
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
|
- MIGRATION_STATUS_ACTIVE);
|
|
|
|
trace_migration_thread_setup_complete();
|
|
|
|
@@ -3850,21 +3860,9 @@ static void *bg_migration_thread(void *opaque)
|
|
qemu_savevm_state_header(s->to_dst_file);
|
|
qemu_savevm_state_setup(s->to_dst_file);
|
|
|
|
- if (qemu_savevm_state_guest_unplug_pending()) {
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
|
- MIGRATION_STATUS_WAIT_UNPLUG);
|
|
-
|
|
- while (s->state == MIGRATION_STATUS_WAIT_UNPLUG &&
|
|
- qemu_savevm_state_guest_unplug_pending()) {
|
|
- qemu_sem_timedwait(&s->wait_unplug_sem, 250);
|
|
- }
|
|
+ qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP,
|
|
+ MIGRATION_STATUS_ACTIVE);
|
|
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_WAIT_UNPLUG,
|
|
- MIGRATION_STATUS_ACTIVE);
|
|
- } else {
|
|
- migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
|
|
- MIGRATION_STATUS_ACTIVE);
|
|
- }
|
|
s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
|
|
|
|
trace_migration_thread_setup_complete();
|
|
--
|
|
2.27.0
|
|
|