diff options
| author | Steve Sistare <steven.sistare@oracle.com> | 2024-01-03 12:05:37 -0800 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-01-04 09:52:42 +0800 |
| commit | 49a5020697001eb96693e8a289c13b89149c7fef (patch) | |
| tree | 16f7cf6b05c99400fea785c48e80ac0a7faf702f | |
| parent | 58b105703e86c1721d1a4cb9f6aaaca49c82145e (diff) | |
| download | qemu-49a5020697001eb96693e8a289c13b89149c7fef.zip qemu-49a5020697001eb96693e8a289c13b89149c7fef.tar.gz qemu-49a5020697001eb96693e8a289c13b89149c7fef.tar.bz2 | |
migration: preserve suspended for bg_migration
Do not wake a suspended guest during bg_migration, and restore the prior
state at finish rather than unconditionally running. Allow the additional
state transitions that occur.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/1704312341-66640-9-git-send-email-steven.sistare@oracle.com
Signed-off-by: Peter Xu <peterx@redhat.com>
| -rw-r--r-- | migration/migration.c | 7 | ||||
| -rw-r--r-- | system/runstate.c | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/migration/migration.c b/migration/migration.c index 8124811..2cc7e2a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3390,7 +3390,7 @@ static void bg_migration_vm_start_bh(void *opaque) qemu_bh_delete(s->vm_start_bh); s->vm_start_bh = NULL; - vm_start(); + vm_resume(s->vm_old_state); migration_downtime_end(s); } @@ -3462,11 +3462,6 @@ 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(); diff --git a/system/runstate.c b/system/runstate.c index ca9eb54..621a023 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -168,6 +168,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_SUSPENDED, RUN_STATE_PAUSED}, { RUN_STATE_SUSPENDED, RUN_STATE_SAVE_VM }, { RUN_STATE_SUSPENDED, RUN_STATE_RESTORE_VM }, + { RUN_STATE_SUSPENDED, RUN_STATE_SHUTDOWN }, { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, |