diff options
author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-03-10 09:06:34 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-10 09:06:55 -0600 |
commit | 81d9b784df3276cb6fa92376e587c67b2f09537b (patch) | |
tree | 5928e239269bafba4c6a5c2cd0dccb5abef2cc6f | |
parent | b16f827bdf7444b8cd338b9ecb654b4752f47225 (diff) | |
download | qemu-81d9b784df3276cb6fa92376e587c67b2f09537b.zip qemu-81d9b784df3276cb6fa92376e587c67b2f09537b.tar.gz qemu-81d9b784df3276cb6fa92376e587c67b2f09537b.tar.bz2 |
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>
-rw-r--r-- | vl.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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(); } |