Commit 00c3a37c authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Use CONFIG_PPC_BOOK3S define 



Upstream recently added a new name for PPC64: Book3S_64.

So instead of using CONFIG_PPC64 we should use CONFIG_PPC_BOOK3S consotently.
That makes understanding the code easier (I hope).

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c14dea04

arch/powerpc/include/asm/kvm_host.h

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct kvm_vcpu_stat { 
	u32 dec_exits;

	u32 ext_intr_exits;

	u32 halt_wakeup;

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	u32 pf_storage;

	u32 pf_instruc;

	u32 sp_storage;
@@ -160,7 +160,7 @@ struct hpte_cache { 
struct kvm_vcpu_arch {

	ulong host_stack;

	u32 host_pid;

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	ulong host_msr;

	ulong host_r2;

	void *host_retip;
@@ -201,7 +201,7 @@ struct kvm_vcpu_arch { 
#endif



	ulong msr;

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	ulong shadow_msr;

	ulong shadow_srr1;

	ulong hflags;
@@ -283,7 +283,7 @@ struct kvm_vcpu_arch { 
	u64 dec_jiffies;

	unsigned long pending_exceptions;



#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	struct hpte_cache hpte_cache[HPTEG_CACHE_NUM];

	int hpte_cache_offset;

#endif

arch/powerpc/kernel/asm-offsets.c

+3 −3
Original line number Diff line number Diff line
@@ -426,8 +426,8 @@ int main(void) 
	DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));

	DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));



	/* book3s_64 */

#ifdef CONFIG_PPC64

	/* book3s */

#ifdef CONFIG_PPC_BOOK3S

	DEFINE(VCPU_FAULT_DSISR, offsetof(struct kvm_vcpu, arch.fault_dsisr));

	DEFINE(VCPU_HOST_RETIP, offsetof(struct kvm_vcpu, arch.host_retip));

	DEFINE(VCPU_HOST_R2, offsetof(struct kvm_vcpu, arch.host_r2));
@@ -442,7 +442,7 @@ int main(void) 
#else

	DEFINE(VCPU_CR, offsetof(struct kvm_vcpu, arch.cr));

	DEFINE(VCPU_XER, offsetof(struct kvm_vcpu, arch.xer));

#endif /* CONFIG_PPC64 */

#endif /* CONFIG_PPC_BOOK3S */

#endif

#ifdef CONFIG_44x

	DEFINE(PGD_T_LOG2, PGD_T_LOG2);

arch/powerpc/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ config KVM_BOOK3S_64_HANDLER 


config KVM_BOOK3S_64

	tristate "KVM support for PowerPC book3s_64 processors"

	depends on EXPERIMENTAL && PPC64

	depends on EXPERIMENTAL && PPC_BOOK3S_64

	select KVM

	select KVM_BOOK3S_64_HANDLER

	---help---

arch/powerpc/kvm/emulate.c

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#define OP_STH  44

#define OP_STHU 45



#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu)

{

	return 1;
@@ -86,7 +86,7 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu) 
	unsigned long dec_nsec;



	pr_debug("mtDEC: %x\n", vcpu->arch.dec);

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	/* mtdec lowers the interrupt line when positive. */

	kvmppc_core_dequeue_dec(vcpu);
@@ -153,7 +153,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 


	switch (get_op(inst)) {

	case OP_TRAP:

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3S

	case OP_TRAP_64:

		kvmppc_core_queue_program(vcpu, SRR1_PROGTRAP);

#else