qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: "Juan Quintela" <quintela@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Steve Sistare" <steven.sistare@oracle.com>
Subject: [PATCH V2 03/10] migration: add runstate function
Date: Fri, 30 Jun 2023 06:49:41 -0700	[thread overview]
Message-ID: <1688132988-314397-4-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1688132988-314397-1-git-send-email-steven.sistare@oracle.com>

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

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 migration/migration.c | 14 ++++++++++++++
 migration/migration.h |  1 +
 migration/savevm.c    | 11 +----------
 3 files changed, 16 insertions(+), 10 deletions(-)

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);
 
-- 
1.8.3.1



  parent reply	other threads:[~2023-06-30 13:51 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-30 13:49 [PATCH V2 00/10] fix migration of suspended runstate Steve Sistare
2023-06-30 13:49 ` [PATCH V2 01/10] vl: start on wakeup request Steve Sistare
2023-07-14 12:47   ` Fabiano Rosas
2023-06-30 13:49 ` [PATCH V2 02/10] migration: preserve suspended runstate Steve Sistare
2023-07-14 12:48   ` Fabiano Rosas
2023-06-30 13:49 ` Steve Sistare [this message]
2023-07-14 12:48   ` [PATCH V2 03/10] migration: add runstate function Fabiano Rosas
2023-06-30 13:49 ` [PATCH V2 04/10] migration: preserve suspended for snapshot Steve Sistare
2023-06-30 13:49 ` [PATCH V2 05/10] migration: preserve suspended for bg_migration Steve Sistare
2023-06-30 13:49 ` [PATCH V2 06/10] tests/qtest: migration events Steve Sistare
2023-07-14 12:57   ` Fabiano Rosas
2023-06-30 13:49 ` [PATCH V2 07/10] tests/qtest: option to suspend during migration Steve Sistare
2023-06-30 13:49 ` [PATCH V2 08/10] tests/qtest: precopy migration with suspend Steve Sistare
2023-06-30 13:49 ` [PATCH V2 09/10] tests/qtest: postcopy " Steve Sistare
2023-06-30 13:49 ` [PATCH V2 10/10] tests/qtest: background " Steve Sistare

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1688132988-314397-4-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=berrange@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).