[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] QMP: Really move the RESET event to qemu_system_res
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH] QMP: Really move the RESET event to qemu_system_reset() |
Date: |
Wed, 10 Mar 2010 11:54:50 -0300 |
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 <address@hidden>
---
vl.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
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();
}
--
1.7.0.2.182.ge007
- [Qemu-devel] [PATCH] QMP: Really move the RESET event to qemu_system_reset(),
Luiz Capitulino <=