QMP: Move RESET event into qemu_system_reset()
authorLuiz Capitulino <lcapitulino@redhat.com>
Thu, 25 Feb 2010 15:07:00 +0000 (12:07 -0300)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Mar 2010 17:30:08 +0000 (11:30 -0600)
Nothing will change as that function is currently only called by
the main loop code, but it's the right place for the RESET event,
as it's where the reset is actually performed.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
vl.c

diff --git a/vl.c b/vl.c
index 833113852f1c5e43dc1f536c2f15e7145f34f283..65cc0209113440df1a9d6ec6f721236443d637d7 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3139,6 +3139,8 @@ static void do_vm_stop(int reason)
         vm_state_notify(0, reason);
         monitor_protocol_event(QEVENT_STOP, NULL);
     }
+
+    monitor_protocol_event(QEVENT_RESET, NULL);
 }
 
 void qemu_register_reset(QEMUResetHandler *func, void *opaque)
@@ -4096,7 +4098,6 @@ static void main_loop(void)
                 break;
         }
         if (qemu_reset_requested()) {
-            monitor_protocol_event(QEVENT_RESET, NULL);
             pause_all_vcpus();
             qemu_system_reset();
             resume_all_vcpus();