From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpNJR-0005WF-34 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 09:55:05 -0500 Received: from [199.232.76.173] (port=43543 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpNJQ-0005Ve-Lf for qemu-devel@nongnu.org; Wed, 10 Mar 2010 09:55:04 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpNJP-0004W3-4Q for qemu-devel@nongnu.org; Wed, 10 Mar 2010 09:55:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39017) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpNJO-0004VP-Ns for qemu-devel@nongnu.org; Wed, 10 Mar 2010 09:55:02 -0500 Date: Wed, 10 Mar 2010 11:54:50 -0300 From: Luiz Capitulino Message-ID: <20100310115450.1f5f6c8d@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] QMP: Really move the RESET event to qemu_system_reset() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- 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