KVM: PPC: use definitions in epapr header for hcalls
Subsystems (2)
PATCH 2/56 KVM: PPC: use definitions in epapr header for hcalls
From: Stuart Yoder <[email protected]>
Signed-off-by Stuart Yoder <[email protected]>
Signed-off-by Alexander Graf <[email protected]>
--- arch/powerpc/include/asm/kvm_para.h | 21 +++++++++++---------- arch/powerpc/kernel/kvm.c | 2 +- arch/powerpc/kvm/powerpc.c | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-)
arch/powerpc/include/asm/kvm_para.h +11 -10
@@ -75,9 +75,10 @@ struct kvm_vcpu_arch_shared { };#define KVM_SC_MAGIC_R0 0x4b564d21/* "KVM!" */ -#define HC_VENDOR_KVM (42 << 16) -#define HC_EV_SUCCESS 0 -#define HC_EV_UNIMPLEMENTED 12 + +#define KVM_HCALL_TOKEN (num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num) + +#include <asm/epapr_hcalls.h> #define KVM_FEATURE_MAGIC_PAGE 1
@@ -121,7 +122,7 @@ static unsigned long kvm_hypercall(unsigned long *in, unsigned long *out, unsigned long nr) { -return HC_EV_UNIMPLEMENTED ; +return EV_UNIMPLEMENTED ; }#endif
@@ -132,7 +133,7 @@ static inline long kvm_hypercall0_1(unsigned int nr, unsigned long *r2)unsigned long out[8 ];unsigned long r; - r =kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); + r =kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); *r2 = out[0 ];return r;
@@ -143,7 +144,7 @@ static inline long kvm_hypercall0(unsigned int nr)unsigned long in[8 ];unsigned long out[8 ]; -return kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); +return kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); }static inline long kvm_hypercall1 (unsigned int nr,unsigned long p1)
@@ -152,7 +153,7 @@ static inline long kvm_hypercall1(unsigned int nr, unsigned long p1)unsigned long out[8 ]; in[0 ] = p1; -return kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); +return kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); } static inline long kvm_hypercall2(unsigned int nr, unsigned long p1,
@@ -163,7 +164,7 @@ static inline long kvm_hypercall2(unsigned int nr, unsigned long p1, in[0 ] = p1; in[1 ] = p2; -return kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); +return kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); } static inline long kvm_hypercall3(unsigned int nr, unsigned long p1,
@@ -175,7 +176,7 @@ static inline long kvm_hypercall3(unsigned int nr, unsigned long p1, in[0 ] = p1; in[1 ] = p2; in[2 ] = p3; -return kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); +return kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); } static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
@@ -189,7 +190,7 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, in[1 ] = p2; in[2 ] = p3; in[3 ] = p4; -return kvm_hypercall (in, out, nr |HC_VENDOR_KVM ); +return kvm_hypercall (in, out,KVM_HCALL_TOKEN (nr)); }
arch/powerpc/kernel/kvm.c +1 -1
@@ -419,7 +419,7 @@ static void kvm_map_magic_page(void *data) in[0 ] =KVM_MAGIC_PAGE ; in[1 ] =KVM_MAGIC_PAGE ; -kvm_hypercall (in, out,HC_VENDOR_KVM |KVM_HC_PPC_MAP_MAGIC_PAGE ); +kvm_hypercall (in, out,KVM_HCALL_TOKEN (KVM_HC_PPC_MAP_MAGIC_PAGE )); *features = out[0 ]; }
arch/powerpc/kvm/powerpc.c +5 -5
@@ -67,18 +67,18 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) }switch (nr) { -case HC_VENDOR_KVM |KVM_HC_PPC_MAP_MAGIC_PAGE : +case KVM_HCALL_TOKEN (KVM_HC_PPC_MAP_MAGIC_PAGE ): { vcpu->arch.magic_page_pa = param1; vcpu->arch.magic_page_ea = param2; r2 =KVM_MAGIC_FEAT_SR |KVM_MAGIC_FEAT_MAS0_TO_SPRG7 ; - r =HC_EV_SUCCESS ; + r =EV_SUCCESS ;break ; } -case HC_VENDOR_KVM |KVM_HC_FEATURES : - r =HC_EV_SUCCESS ; +case KVM_HCALL_TOKEN (KVM_HC_FEATURES ): + r =EV_SUCCESS ;#if defined(CONFIG_PPC_BOOK3S ) || defined(CONFIG_KVM_E500V2 )/* XXX Missing magic page on 44x */ r2 |= (1 <<KVM_FEATURE_MAGIC_PAGE );
@@ -87,7 +87,7 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu)/* Second return value is in r4 */ break ;default : - r =HC_EV_UNIMPLEMENTED ; + r =EV_UNIMPLEMENTED ;break ; }
Signature · 1 line
1.6.0.2