From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MvApu-0003wi-Fg
	for qemu-devel@nongnu.org; Tue, 06 Oct 2009 10:16:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MvApp-0003sj-MO
	for qemu-devel@nongnu.org; Tue, 06 Oct 2009 10:16:17 -0400
Received: from [199.232.76.173] (port=40296 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MvApp-0003sQ-D8
	for qemu-devel@nongnu.org; Tue, 06 Oct 2009 10:16:13 -0400
Received: from mail-qy0-f173.google.com ([209.85.221.173]:43729)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1MvApp-0005Uk-3b
	for qemu-devel@nongnu.org; Tue, 06 Oct 2009 10:16:13 -0400
Received: by qyk3 with SMTP id 3so3472937qyk.4
	for <qemu-devel@nongnu.org>; Tue, 06 Oct 2009 07:16:11 -0700 (PDT)
Message-ID: <4ACB5125.5010400@codemonkey.ws>
Date: Tue, 06 Oct 2009 09:16:05 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] Fix infinite loop in i386 cpu_post_load()
References: <1254826053-19132-1-git-send-email-avi@redhat.com>
In-Reply-To: <1254826053-19132-1-git-send-email-avi@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: Avi Kivity <avi@redhat.com>
Cc: qemu-devel@nongnu.org

This was fixed by:

commit 1e7fbc6d3cfcffe1d490ab8851e712c6e98fa771
Author: Juan Quintela <quintela@redhat.com>
Date:   Mon Oct 5 20:30:32 2009 +0200

    x86: fix miss merge

Regards,

Anthony Liguori

Avi Kivity wrote:
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
>  target-i386/machine.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/target-i386/machine.c b/target-i386/machine.c
> index 5607be3..2ae284b 100644
> --- a/target-i386/machine.c
> +++ b/target-i386/machine.c
> @@ -384,7 +384,7 @@ static int cpu_post_load(void *opaque, int version_id)
>          }
>      }
>  
> -    return cpu_post_load(env, version_id);
> +    return 0;
>  }
>  
>  const VMStateDescription vmstate_cpu = {
>