> -----Original Message-----
> From: Caraman Mihai Claudiu-B02008
> Sent: Tuesday, July 15, 2014 10:20 PM
> To: Alexander Graf
> Cc: Bhushan Bharat-R65777; kvm-ppc@xxxxxxxxxxxxxxx
> Subject: Re: [PATCH 6/6] kvm: ppc: Add SPRN_SPR get helper function
>
> > kvmppc_set_epr() is already defined in asm/kvm_ppc.h, So
> > rename and move get_epr helper function to same file.
> >
> > Signed-off-by: Bharat Bhushan <Bharat.Bhushan@xxxxxxxxxxxxx>
> > ---
> > arch/powerpc/include/asm/kvm_ppc.h | 9 +++++++++
> > arch/powerpc/kvm/booke.c | 11 +----------
> > 2 files changed, 10 insertions(+), 10 deletions(-)
>
> This patch which is already applied on kvm-ppc-queue breaks book3s.
> I get these errors with g5_defconfig:
>
> In file included from arch/powerpc/kernel/asm-offsets.c:57:0:
> ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_epr':
> ./arch/powerpc/include/asm/kvm_ppc.h:400:19: error: 'struct kvm_vcpu_arch' has
> no member named 'epr'
> ./arch/powerpc/include/asm/kvm_ppc.h: In function 'kvmppc_get_sprg0':
> ./arch/powerpc/include/asm/kvm_ppc.h:522:1: error: 'SPRN_GSPRG0' undeclared
> (first use in this function)
> ./arch/powerpc/include/asm/kvm_ppc.h:522:1: note: each undeclared identifier is
> reported only once for each function it appears in
> ...
I am sorry, I forgot to compile for book3s.
Should we squash below change to fix these errors.
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index ad14d26..7ad4730 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -399,7 +399,7 @@ static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu)
{
#ifdef CONFIG_KVM_BOOKE_HV
return mfspr(SPRN_GEPR);
-#else
+#elif defined(CONFIG_BOOKE)
return vcpu->arch.epr;
#endif
}
@@ -522,6 +522,7 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val) \
SHARED_WRAPPER_SET(reg, size, e500hv_spr) \
SHARED_WRAPPER(critical, 64, 0)
+#ifdef CONFIG_BOOKE
SHARED_WRAPPER(sprg0, 64, SPRN_GSPRG0)
SHARED_WRAPPER(sprg1, 64, SPRN_GSPRG1)
SHARED_WRAPPER(sprg2, 64, SPRN_GSPRG2)
@@ -530,6 +531,16 @@ SHARED_WRAPPER(srr0, 64, SPRN_GSRR0)
SHARED_WRAPPER(srr1, 64, SPRN_GSRR1)
SHARED_WRAPPER(dar, 64, SPRN_GDEAR)
SHARED_WRAPPER(esr, 64, SPRN_GESR)
+#else
+SHARED_WRAPPER(sprg0, 64, 0)
+SHARED_WRAPPER(sprg1, 64, 0)
+SHARED_WRAPPER(sprg2, 64, 0)
+SHARED_WRAPPER(sprg3, 64, 0)
+SHARED_WRAPPER(srr0, 64, 0)
+SHARED_WRAPPER(srr1, 64, 0)
+SHARED_WRAPPER(dar, 64, 0)
+SHARED_WRAPPER(esr, 64, 0)
+#endif
SHARED_WRAPPER_GET(msr, 64, 0)
static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val)
{
>
> -Mike
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
