From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NpNoi-00021N-7W
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:27:24 -0500
Received: from [199.232.76.173] (port=43530 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NpNoh-00021F-S4
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:27:23 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1NpNog-0007u1-Ee
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:27:23 -0500
Received: from mx20.gnu.org ([199.232.41.8]:22604)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1NpNoW-0007hx-TU
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:27:22 -0500
Received: from mail-qy0-f190.google.com ([209.85.221.190])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NpNll-0006Jm-NJ
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:24:21 -0500
Received: by qyk28 with SMTP id 28so9910167qyk.14
	for <qemu-devel@nongnu.org>; Wed, 10 Mar 2010 07:24:15 -0800 (PST)
Message-ID: <4B97B999.4060404@codemonkey.ws>
Date: Wed, 10 Mar 2010 09:24:09 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] QMP: Really move the RESET event to
	qemu_system_reset()
References: <20100310115450.1f5f6c8d@redhat.com>
In-Reply-To: <20100310115450.1f5f6c8d@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Luiz Capitulino <lcapitulino@redhat.com>
Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org

On 03/10/2010 08:54 AM, Luiz Capitulino wrote:
> 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).
>    

It's not due to conflict resolution, it's due to patch applying with 
fuzz.  I'm not sure I have a great solution to avoid this.

Regards,

Anthony Liguori

> This commit moves (again) the RESET event into qemu_system_reset().
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
> ---
>   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();
>   }
>
>