[V2,03/10] migration: add runstate function

Commit Message

Steven Sistare June 30, 2023, 1:49 p.m. UTC

Create a subroutine for preserving the runstate after migration,
to be used in a subsequent patch.  No functional change.

Signed-off-by: Steve Sistare <[e-mail]>
---
 migration/migration.c | 14 ++++++++++++++
 migration/migration.h |  1 +
 migration/savevm.c    | 11 +----------
 3 files changed, 16 insertions(+), 10 deletions(-)

Comments

Fabiano Rosas July 14, 2023, 12:48 p.m. UTC | #1

Steve Sistare <[e-mail]> writes:

> Create a subroutine for preserving the runstate after migration,
> to be used in a subsequent patch.  No functional change.
>
> Signed-off-by: Steve Sistare <[e-mail]>

Reviewed-by: Fabiano Rosas <[e-mail]>

Patch

diff --git a/migration/migration.c b/migration/migration.c
index 5495571..7a9218b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1125,6 +1125,20 @@  void migrate_set_state(int *state, int old_state, int new_state)
     }
 }
 
+void migrate_set_runstate(void)
+{
+    if (!global_state_received() ||
+        global_state_get_runstate() == RUN_STATE_RUNNING) {
+        if (autostart) {
+            vm_start();
+        } else {
+            runstate_set(RUN_STATE_PAUSED);
+        }
+    } else {
+        runstate_set(global_state_get_runstate());
+    }
+}
+
 static void migrate_fd_cleanup(MigrationState *s)
 {
     qemu_bh_delete(s->cleanup_bh);
diff --git a/migration/migration.h b/migration/migration.h
index 30c3e97..91c66b5 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -443,6 +443,7 @@  struct MigrationState {
 };
 
 void migrate_set_state(int *state, int old_state, int new_state);
+void migrate_set_runstate(void);
 
 void migration_fd_process_incoming(QEMUFile *f, Error **errp);
 void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
diff --git a/migration/savevm.c b/migration/savevm.c
index dfdbf02..e0f4972 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2069,16 +2069,7 @@  static void loadvm_postcopy_handle_run_bh(void *opaque)
 
     dirty_bitmap_mig_before_vm_start();
 
-    if (!global_state_received() ||
-        global_state_get_runstate() == RUN_STATE_RUNNING) {
-        if (autostart) {
-            vm_start();
-        } else {
-            runstate_set(RUN_STATE_PAUSED);
-        }
-    } else {
-        runstate_set(global_state_get_runstate());
-    }
+    migrate_set_runstate();
 
     qemu_bh_delete(mis->bh);