From patchwork Sat Dec 19 00:58:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 41450 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 1EBCFB6F14 for ; Sat, 19 Dec 2009 12:00:04 +1100 (EST) Received: from localhost ([127.0.0.1]:49999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLnfc-0006xm-9U for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2009 19:59:44 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLnf0-0006ta-Nf for qemu-devel@nongnu.org; Fri, 18 Dec 2009 19:59:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLnew-0006lr-RM for qemu-devel@nongnu.org; Fri, 18 Dec 2009 19:59:06 -0500 Received: from [199.232.76.173] (port=54415 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLnew-0006lb-Ni for qemu-devel@nongnu.org; Fri, 18 Dec 2009 19:59:02 -0500 Received: from cantor.suse.de ([195.135.220.2]:49195 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NLnew-0005Po-WB for qemu-devel@nongnu.org; Fri, 18 Dec 2009 19:59:03 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 7715B90975; Sat, 19 Dec 2009 01:59:00 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Sat, 19 Dec 2009 01:58:59 +0100 Message-Id: <1261184339-19692-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH] PPC: Fix ppc32 kvm build 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 My segment sync patch broke compilation on PPC32, because it was trying to sync the SLB even though ppc32 CPUs don't have an SLB. So let's only sync it when we're on a PP64 one! Signed-off-by: Alexander Graf --- target-ppc/kvm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 2b5abf4..0424a78 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -135,10 +135,12 @@ int kvm_arch_get_registers(CPUState *env) env->sdr1 = sregs.u.s.sdr1; /* Sync SLB */ +#ifdef TARGET_PPC64 for (i = 0; i < 64; i++) { ppc_store_slb(env, sregs.u.s.ppc64.slb[i].slbe, sregs.u.s.ppc64.slb[i].slbv); } +#endif /* Sync SRs */ for (i = 0; i < 16; i++) {