aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2010-02-25 12:07:00 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-08 11:30:08 -0600
commit0ee442502bc8af7fe1679ccf775e54fcf62dd8ac (patch)
tree378c47450c073c74864aa16f7f5795bcae4175ea
parent6b8f8fff78185cb260d1ca3c30352c0bf5601d36 (diff)
downloadqemu-0ee442502bc8af7fe1679ccf775e54fcf62dd8ac.zip
qemu-0ee442502bc8af7fe1679ccf775e54fcf62dd8ac.tar.gz
qemu-0ee442502bc8af7fe1679ccf775e54fcf62dd8ac.tar.bz2
QMP: Move RESET event into qemu_system_reset()
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>
-rw-r--r--vl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 8331138..65cc020 100644
--- 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();