[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] main-loop: refactor qemu_system_shutdown_reques
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 4/9] main-loop: refactor qemu_system_shutdown_request() |
Date: |
Wed, 20 Feb 2013 09:32:44 -0600 |
There are two open coded versions of shutdown depending on whether
the -no-shutdown flag is used or not. Refactor to just one.
Signed-off-by: Anthony Liguori <address@hidden>
---
vl.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/vl.c b/vl.c
index 705c7f1..4810178 100644
--- a/vl.c
+++ b/vl.c
@@ -1824,12 +1824,12 @@ void qemu_system_reset(bool report)
void qemu_system_reset_request(void)
{
if (no_reboot) {
- shutdown_requested = 1;
+ qemu_system_shutdown_request();
} else {
reset_requested = 1;
+ cpu_stop_current();
+ qemu_notify_event();
}
- cpu_stop_current();
- qemu_notify_event();
}
static gboolean qemu_system_suspend(gpointer unused)
@@ -1891,9 +1891,21 @@ void qemu_system_killed(int signal, pid_t pid)
qemu_system_shutdown_request();
}
+static void qemu_system_shutdown(void)
+{
+ qemu_kill_report();
+ monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
+ if (no_shutdown) {
+ vm_stop(RUN_STATE_SHUTDOWN);
+ } else {
+ main_loop_quit();
+ }
+}
+
void qemu_system_shutdown_request(void)
{
shutdown_requested = 1;
+ cpu_stop_current();
qemu_notify_event();
}
@@ -1935,14 +1947,7 @@ static void main_loop_junk(void)
{
RunState r;
if (qemu_shutdown_requested()) {
- qemu_kill_report();
- monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
- if (no_shutdown) {
- vm_stop(RUN_STATE_SHUTDOWN);
- } else {
- main_loop_quit();
- return;
- }
+ qemu_system_shutdown();
}
if (qemu_reset_requested()) {
pause_all_vcpus();
--
1.8.0
[Qemu-devel] [PATCH 6/9] main-loop: refactor qemu_system_reset_request(), Anthony Liguori, 2013/02/20
[Qemu-devel] [PATCH 5/9] main-loop: refactor qemu_system_shutdown_request(), Anthony Liguori, 2013/02/20
[Qemu-devel] [PATCH 8/9] main-loop: refactor qemu_system_powerdown_request, Anthony Liguori, 2013/02/20
[Qemu-devel] [PATCH 7/9] main-loop: refactor qemu_system_wakeup_request(), Anthony Liguori, 2013/02/20
[Qemu-devel] [PATCH 9/9] main-loop: refactor qemu_system_vmstop_request(), Anthony Liguori, 2013/02/20