From patchwork Fri Mar 5 16:50:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 83782 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o25GpD1k009386 for ; Fri, 5 Mar 2010 16:51:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754868Ab0CEQvJ (ORCPT ); Fri, 5 Mar 2010 11:51:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:56647 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235Ab0CEQuo (ORCPT ); Fri, 5 Mar 2010 11:50:44 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 15D618891E; Fri, 5 Mar 2010 17:50:43 +0100 (CET) From: Alexander Graf To: kvm-ppc@vger.kernel.org Cc: kvm@vger.kernel.org Subject: [PATCH 01/15] KVM: PPC: Make register read/write wrappers always work Date: Fri, 5 Mar 2010 17:50:28 +0100 Message-Id: <1267807842-3751-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1267807842-3751-1-git-send-email-agraf@suse.de> References: <1267807842-3751-1-git-send-email-agraf@suse.de> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 05 Mar 2010 16:51:13 +0000 (UTC) diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h index e6ea974..3c7b335 100644 --- a/arch/powerpc/include/asm/kvm_book3s.h +++ b/arch/powerpc/include/asm/kvm_book3s.h @@ -78,6 +78,7 @@ struct kvmppc_vcpu_book3s { u64 vsid; } slb_shadow[64]; u8 slb_shadow_max; + u8 shadow_vcpu_paca; struct kvmppc_sr sr[16]; struct kvmppc_bat ibat[8]; struct kvmppc_bat dbat[8]; diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index c7fcdd7..c3912e9 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -151,9 +151,12 @@ static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val) static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) { - if ( num < 14 ) - return get_paca()->shadow_vcpu.gpr[num]; - else + if ( num < 14 ) { + if (to_book3s(vcpu)->shadow_vcpu_paca) + return get_paca()->shadow_vcpu.gpr[num]; + else + return to_book3s(vcpu)->shadow_vcpu.gpr[num]; + } else return vcpu->arch.gpr[num]; } @@ -165,7 +168,10 @@ static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val) static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) { - return get_paca()->shadow_vcpu.cr; + if (to_book3s(vcpu)->shadow_vcpu_paca) + return get_paca()->shadow_vcpu.cr; + else + return to_book3s(vcpu)->shadow_vcpu.cr; } static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, u32 val) @@ -176,7 +182,10 @@ static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, u32 val) static inline u32 kvmppc_get_xer(struct kvm_vcpu *vcpu) { - return get_paca()->shadow_vcpu.xer; + if (to_book3s(vcpu)->shadow_vcpu_paca) + return get_paca()->shadow_vcpu.xer; + else + return to_book3s(vcpu)->shadow_vcpu.xer; } #else diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 94c229d..8a04ec6 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -73,10 +73,12 @@ void kvmppc_core_vcpu_load(struct kvm_vcpu *vcpu, int cpu) memcpy(&get_paca()->shadow_vcpu, &to_book3s(vcpu)->shadow_vcpu, sizeof(get_paca()->shadow_vcpu)); get_paca()->kvm_slb_max = to_book3s(vcpu)->slb_shadow_max; + to_book3s(vcpu)->shadow_vcpu_paca = true; } void kvmppc_core_vcpu_put(struct kvm_vcpu *vcpu) { + to_book3s(vcpu)->shadow_vcpu_paca = false; memcpy(to_book3s(vcpu)->slb_shadow, get_paca()->kvm_slb, sizeof(get_paca()->kvm_slb)); memcpy(&to_book3s(vcpu)->shadow_vcpu, &get_paca()->shadow_vcpu, sizeof(get_paca()->shadow_vcpu));