From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NpNpK-0002C0-UR
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:28:02 -0500
Received: from [199.232.76.173] (port=43452 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NpNpK-0002Bg-DO
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:28:02 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1NpNpI-0007vv-Hn
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:28:02 -0500
Received: from mail-px0-f176.google.com ([209.85.216.176]:55682)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NpNpH-0007vg-Uf
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 10:28:00 -0500
Received: by pxi6 with SMTP id 6so3473604pxi.18
	for <qemu-devel@nongnu.org>; Wed, 10 Mar 2010 07:27:57 -0800 (PST)
Message-ID: <4B97BA79.60100@codemonkey.ws>
Date: Wed, 10 Mar 2010 09:27:53 -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).
>
> This commit moves (again) the RESET event into qemu_system_reset().
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

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