From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MusKr-0007Rr-13 for qemu-devel@nongnu.org; Mon, 05 Oct 2009 14:31:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MusKl-0007Rf-Ja for qemu-devel@nongnu.org; Mon, 05 Oct 2009 14:30:59 -0400 Received: from [199.232.76.173] (port=38443 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MusKl-0007Rc-Ed for qemu-devel@nongnu.org; Mon, 05 Oct 2009 14:30:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51989) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MusKk-0003fJ-VM for qemu-devel@nongnu.org; Mon, 05 Oct 2009 14:30:55 -0400 From: Juan Quintela Date: Mon, 5 Oct 2009 20:30:32 +0200 Message-Id: <1254767432-27013-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH] x86: fix miss merge List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org There was a missmerge, and then we got a tail recursive call to cpu_post_load without case base :) Signed-off-by: Juan Quintela --- target-i386/machine.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-i386/machine.c b/target-i386/machine.c index c008209..b13eff4 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -383,7 +383,8 @@ static int cpu_post_load(void *opaque, int version_id) } } - return cpu_post_load(env, version_id); + tlb_flush(env, 1); + return 0; } const VMStateDescription vmstate_cpu = { -- 1.6.2.5