From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Wed, 10 Mar 2010 15:06:34 +0000 (-0600)
Subject: QMP: Really move the RESET event to qemu_system_reset()
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~8489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81d9b784df3276cb6fa92376e587c67b2f09537b;p=sdk%2Femulator%2Fqemu.git

QMP: Really move the RESET event to qemu_system_reset()

Something bad has happened in the merge of commit 0ee44250, as
the log message says it's supposed to be in qemu_system_reset()
but it is do_vm_stop().

Possibly, it was a problem with the conflict resolution with
ea375f9a (which has been merged first).

This commit moves (again) the RESET event into qemu_system_reset().

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

diff --git a/vl.c b/vl.c
index d8328c7..fd89e50 100644
--- a/vl.c
+++ b/vl.c
@@ -3148,8 +3148,6 @@ 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)
@@ -3182,6 +3180,7 @@ void qemu_system_reset(void)
     QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
         re->func(re->opaque);
     }
+    monitor_protocol_event(QEVENT_RESET, NULL);
     cpu_synchronize_all_post_reset();
 }