[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 05/10] migration: preserve suspended for bg_migration
From: |
Steve Sistare |
Subject: |
[PATCH V2 05/10] migration: preserve suspended for bg_migration |
Date: |
Fri, 30 Jun 2023 06:49:43 -0700 |
Do not wake a suspended guest during bg_migration.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
migration/migration.c | 12 +++++-------
softmmu/runstate.c | 1 +
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 7a9218b..125e060 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3044,7 +3044,9 @@ static void bg_migration_vm_start_bh(void *opaque)
qemu_bh_delete(s->vm_start_bh);
s->vm_start_bh = NULL;
- vm_start();
+ if (!runstate_check(RUN_STATE_SUSPENDED)) {
+ vm_start();
+ }
s->downtime = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - s->downtime_start;
}
@@ -3114,16 +3116,12 @@ static void *bg_migration_thread(void *opaque)
qemu_mutex_lock_iothread();
- /*
- * If VM is currently in suspended state, then, to make a valid runstate
- * transition in vm_stop_force_state() we need to wakeup it up.
- */
- qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
s->vm_old_state = runstate_get();
global_state_store();
/* Forcibly stop VM before saving state of vCPUs and devices */
- if (vm_stop_force_state(RUN_STATE_PAUSED)) {
+ if (!runstate_check(RUN_STATE_SUSPENDED) &&
+ vm_stop_force_state(RUN_STATE_PAUSED)) {
goto fail;
}
/*
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index 18efe31..35ce343 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -163,6 +163,7 @@ static const RunStateTransition runstate_transitions_def[]
= {
{ RUN_STATE_SUSPENDED, RUN_STATE_FINISH_MIGRATE },
{ RUN_STATE_SUSPENDED, RUN_STATE_PRELAUNCH },
{ RUN_STATE_SUSPENDED, RUN_STATE_COLO},
+ { RUN_STATE_SUSPENDED, RUN_STATE_PAUSED },
{ RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
{ RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
--
1.8.3.1
- [PATCH V2 00/10] fix migration of suspended runstate, Steve Sistare, 2023/06/30
- [PATCH V2 02/10] migration: preserve suspended runstate, Steve Sistare, 2023/06/30
- [PATCH V2 05/10] migration: preserve suspended for bg_migration,
Steve Sistare <=
- [PATCH V2 09/10] tests/qtest: postcopy migration with suspend, Steve Sistare, 2023/06/30
- [PATCH V2 03/10] migration: add runstate function, Steve Sistare, 2023/06/30
- [PATCH V2 08/10] tests/qtest: precopy migration with suspend, Steve Sistare, 2023/06/30
- [PATCH V2 10/10] tests/qtest: background migration with suspend, Steve Sistare, 2023/06/30
- [PATCH V2 07/10] tests/qtest: option to suspend during migration, Steve Sistare, 2023/06/30
- [PATCH V2 01/10] vl: start on wakeup request, Steve Sistare, 2023/06/30
- [PATCH V2 04/10] migration: preserve suspended for snapshot, Steve Sistare, 2023/06/30
- [PATCH V2 06/10] tests/qtest: migration events, Steve Sistare, 2023/06/30