From patchwork Wed May 12 17:52:46 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1/3] Revert "Monitor: Return before exiting with 'quit'"
Date: Wed, 12 May 2010 07:52:46 -0000
From: Luiz Capitulino <lcapitulino@redhat.com>
X-Patchwork-Id: 52396
Message-Id: <1273686768-26561-2-git-send-email-lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com

This reverts commit 0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d.

Next commits will do the same thing in a better way.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

---
monitor.c |    3 +--
 sysemu.h  |    2 --
 vl.c      |   18 ------------------
 3 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/monitor.c b/monitor.c
index 4c95d7b..e984122 100644
--- a/monitor.c
+++ b/monitor.c
@@ -942,8 +942,7 @@ static void do_info_cpu_stats(Monitor *mon)
  */
 static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
-    monitor_suspend(mon);
-    qemu_system_exit_request();
+    exit(0);
     return 0;
 }
 
diff --git a/sysemu.h b/sysemu.h
index 47975b5..fcfccdf 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -45,11 +45,9 @@ void cpu_disable_ticks(void);
 void qemu_system_reset_request(void);
 void qemu_system_shutdown_request(void);
 void qemu_system_powerdown_request(void);
-void qemu_system_exit_request(void);
 int qemu_shutdown_requested(void);
 int qemu_reset_requested(void);
 int qemu_powerdown_requested(void);
-int qemu_exit_requested(void);
 extern qemu_irq qemu_system_powerdown;
 void qemu_system_reset(void);
 
diff --git a/vl.c b/vl.c
index 85bcc84..791564a 100644
--- a/vl.c
+++ b/vl.c
@@ -1708,7 +1708,6 @@ static int shutdown_requested;
 static int powerdown_requested;
 int debug_requested;
 int vmstop_requested;
-static int exit_requested;
 
 int qemu_shutdown_requested(void)
 {
@@ -1731,12 +1730,6 @@ int qemu_powerdown_requested(void)
     return r;
 }
 
-int qemu_exit_requested(void)
-{
-    /* just return it, we'll exit() anyway */
-    return exit_requested;
-}
-
 static int qemu_debug_requested(void)
 {
     int r = debug_requested;
@@ -1807,12 +1800,6 @@ void qemu_system_powerdown_request(void)
     qemu_notify_event();
 }
 
-void qemu_system_exit_request(void)
-{
-    exit_requested = 1;
-    qemu_notify_event();
-}
-
 #ifdef _WIN32
 static void host_main_loop_wait(int *timeout)
 {
@@ -1949,8 +1936,6 @@ static int vm_can_run(void)
         return 0;
     if (debug_requested)
         return 0;
-    if (exit_requested)
-        return 0;
     return 1;
 }
 
@@ -2003,9 +1988,6 @@ static void main_loop(void)
         if ((r = qemu_vmstop_requested())) {
             vm_stop(r);
         }
-        if (qemu_exit_requested()) {
-            exit(0);
-        }
     }
     pause_all_vcpus();
 }