From patchwork Mon Oct 5 18:30:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35043 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EF3AEB7BBD for ; Tue, 6 Oct 2009 05:31:40 +1100 (EST) Received: from localhost ([127.0.0.1]:45551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MusLQ-0007V2-OW for incoming@patchwork.ozlabs.org; Mon, 05 Oct 2009 14:31:36 -0400 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 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n95IUotY017144; Mon, 5 Oct 2009 14:30:50 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n95IUmLK019214; Mon, 5 Oct 2009 14:30:49 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 5 Oct 2009 20:30:32 +0200 Message-Id: <1254767432-27013-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] x86: fix miss merge X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 = {