OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QMP: Really move the RESET event to qemu_system_reset()

Browse Source 
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>
This commit is contained in:
Luiz Capitulino 2010-03-10 09:06:34 -06:00 committed by Anthony Liguori
parent b16f827bdf
commit 81d9b784df
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vl.c
View File

@ -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();
}