Patchwork [2/9] main-loop: refactor qemu_system_debug_request()

login
register
mail settings
Submitter Anthony Liguori
Date Feb. 20, 2013, 3:32 p.m.
Message ID <1361374369-19024-3-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/222102/
State New
Headers show

Comments

Anthony Liguori - Feb. 20, 2013, 3:32 p.m.
Instead of explicitly polling a global variable and dispatching to
a hard coded function, just register an idle fuction callback.

qemu_notify_event() is no longer needed since glib takes care of
breaking the main loop.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 vl.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Patch

diff --git a/vl.c b/vl.c
index d6c5626..a305fed 100644
--- a/vl.c
+++ b/vl.c
@@ -1700,7 +1700,6 @@  static int reset_requested;
 static int shutdown_requested, shutdown_signal = -1;
 static pid_t shutdown_pid;
 static int powerdown_requested;
-static int debug_requested;
 static int suspend_requested;
 static int wakeup_requested;
 static NotifierList powerdown_notifiers =
@@ -1773,13 +1772,6 @@  static int qemu_powerdown_requested(void)
     return r;
 }
 
-static int qemu_debug_requested(void)
-{
-    int r = debug_requested;
-    debug_requested = 0;
-    return r;
-}
-
 /* We use RUN_STATE_MAX but any invalid value will do */
 static bool qemu_vmstop_requested(RunState *r)
 {
@@ -1930,10 +1922,15 @@  void qemu_register_powerdown_notifier(Notifier *notifier)
     notifier_list_add(&powerdown_notifiers, notifier);
 }
 
+static gboolean qemu_system_debug(gpointer unused)
+{
+    vm_stop(RUN_STATE_DEBUG);
+    return FALSE;
+}
+
 void qemu_system_debug_request(void)
 {
-    debug_requested = 1;
-    qemu_notify_event();
+    g_idle_add(qemu_system_debug, NULL);
 }
 
 void qemu_system_vmstop_request(RunState state)
@@ -1945,9 +1942,6 @@  void qemu_system_vmstop_request(RunState state)
 static void main_loop_junk(void)
 {
     RunState r;
-    if (qemu_debug_requested()) {
-        vm_stop(RUN_STATE_DEBUG);
-    }
     if (qemu_suspend_requested()) {
         qemu_system_suspend();
     }