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 V3 01/10] vl: start on wakeup request
Date: Mon, 14 Aug 2023 11:54:27 -0700 [thread overview]
Message-ID: <1692039276-148610-2-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1692039276-148610-1-git-send-email-steven.sistare@oracle.com>
If qemu starts and loads a VM in the suspended state, then a later wakeup
request directly sets the state to running. This skips vm_start() and its
initialization steps, which is fatal for the guest. See
qemu_system_wakeup_request(), and qemu_system_wakeup() in
main_loop_should_exit().
Remember if vm_start has been called. If not, then call vm_start from
qemu_system_wakeup_request.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
---
include/sysemu/runstate.h | 1 +
softmmu/cpus.c | 12 ++++++++++++
softmmu/runstate.c | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
index 7beb29c..42ddf83 100644
--- a/include/sysemu/runstate.h
+++ b/include/sysemu/runstate.h
@@ -34,6 +34,7 @@ static inline bool shutdown_caused_by_guest(ShutdownCause cause)
}
void vm_start(void);
+void vm_wakeup(void);
/**
* vm_prepare_start: Prepare for starting/resuming the VM
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index fed20ff..fa9e5ba 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -66,6 +66,7 @@
#endif /* CONFIG_LINUX */
static QemuMutex qemu_global_mutex;
+static bool vm_started;
/*
* The chosen accelerator is supposed to register this.
@@ -264,6 +265,7 @@ static int do_vm_stop(RunState state, bool send_stop)
if (send_stop) {
qapi_event_send_stop();
}
+ vm_started = false;
}
bdrv_drain_all();
@@ -722,6 +724,16 @@ void vm_start(void)
{
if (!vm_prepare_start(false)) {
resume_all_vcpus();
+ vm_started = true;
+ }
+}
+
+void vm_wakeup(void)
+{
+ if (!vm_started) {
+ vm_start();
+ } else {
+ runstate_set(RUN_STATE_RUNNING);
}
}
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index f3bd862..95c6ae7 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -580,7 +580,7 @@ void qemu_system_wakeup_request(WakeupReason reason, Error **errp)
if (!(wakeup_reason_mask & (1 << reason))) {
return;
}
- runstate_set(RUN_STATE_RUNNING);
+ vm_wakeup();
wakeup_reason = reason;
qemu_notify_event();
}
--
1.8.3.1
next prev parent reply other threads:[~2023-08-14 18:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 18:54 [PATCH V3 00/10] fix migration of suspended runstate Steve Sistare
2023-08-14 18:54 ` Steve Sistare [this message]
2023-08-17 18:27 ` [PATCH V3 01/10] vl: start on wakeup request Peter Xu
2023-08-24 20:54 ` Steven Sistare
2023-08-14 18:54 ` [PATCH V3 02/10] migration: preserve suspended runstate Steve Sistare
2023-08-14 18:54 ` [PATCH V3 03/10] migration: add runstate function Steve Sistare
2023-08-14 18:54 ` [PATCH V3 04/10] migration: preserve suspended for snapshot Steve Sistare
2023-08-14 18:54 ` [PATCH V3 05/10] migration: preserve suspended for bg_migration Steve Sistare
2023-08-14 18:54 ` [PATCH V3 06/10] tests/qtest: migration events Steve Sistare
2023-08-14 18:54 ` [PATCH V3 07/10] tests/qtest: option to suspend during migration Steve Sistare
2023-08-14 18:54 ` [PATCH V3 08/10] tests/qtest: precopy migration with suspend Steve Sistare
2023-08-14 18:54 ` [PATCH V3 09/10] tests/qtest: postcopy " Steve Sistare
2023-08-14 18:54 ` [PATCH V3 10/10] tests/qtest: background " Steve Sistare
2023-08-17 18:23 ` [PATCH V3 00/10] fix migration of suspended runstate Peter Xu
2023-08-24 21:09 ` Steven Sistare
2023-08-25 13:28 ` Steven Sistare
2023-08-25 15:07 ` Peter Xu
2023-08-25 17:56 ` Steven 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=1692039276-148610-2-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).