Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa79938 authored Oct 07, 2013 by Aneesh Kumar K.V Committed by Alexander Graf Oct 17, 2013

kvm: powerpc: book3s: pr: Rename KVM_BOOK3S_PR to KVM_BOOK3S_PR_POSSIBLE



With later patches supporting PR kvm as a kernel module, the changes
that has to be built into the main kernel binary to enable PR KVM module
is now selected via KVM_BOOK3S_PR_POSSIBLE

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 066212e0

arch/powerpc/include/asm/exception-64s.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -244,7 +244,7 @@ do_kvm_##n: \
	#define KVM_HANDLER_SKIP(area, h, n)		#define KVM_HANDLER_SKIP(area, h, n)
	#endif		#endif

	#ifdef CONFIG_KVM_BOOK3S_PR		#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
	#define KVMTEST_PR(n) __KVMTEST(n)		#define KVMTEST_PR(n) __KVMTEST(n)
	#define KVM_HANDLER_PR(area, h, n) __KVM_HANDLER(area, h, n)		#define KVM_HANDLER_PR(area, h, n) __KVM_HANDLER(area, h, n)
	#define KVM_HANDLER_PR_SKIP(area, h, n) __KVM_HANDLER_SKIP(area, h, n)		#define KVM_HANDLER_PR_SKIP(area, h, n) __KVM_HANDLER_SKIP(area, h, n)

arch/powerpc/include/asm/kvm_book3s.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -304,7 +304,7 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
	return vcpu->arch.fault_dar;		return vcpu->arch.fault_dar;
	}		}

	#ifdef CONFIG_KVM_BOOK3S_PR		#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)		static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)
	{		{
	@@ -339,7 +339,7 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu)

	return crit;		return crit;
	}		}
	#else /* CONFIG_KVM_BOOK3S_PR */		#else /* CONFIG_KVM_BOOK3S_PR_POSSIBLE */

	static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)		static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)
	{		{

arch/powerpc/include/asm/kvm_book3s_64.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@
	#ifndef __ASM_KVM_BOOK3S_64_H__		#ifndef __ASM_KVM_BOOK3S_64_H__
	#define __ASM_KVM_BOOK3S_64_H__		#define __ASM_KVM_BOOK3S_64_H__

	#ifdef CONFIG_KVM_BOOK3S_PR		#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
	static inline struct kvmppc_book3s_shadow_vcpu svcpu_get(struct kvm_vcpu vcpu)		static inline struct kvmppc_book3s_shadow_vcpu svcpu_get(struct kvm_vcpu vcpu)
	{		{
	preempt_disable();		preempt_disable();

arch/powerpc/include/asm/kvm_host.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,7 @@ struct kvm_arch {
	struct kvmppc_vcore *vcores[KVM_MAX_VCORES];		struct kvmppc_vcore *vcores[KVM_MAX_VCORES];
	int hpt_cma_alloc;		int hpt_cma_alloc;
	#endif /* CONFIG_KVM_BOOK3S_64_HV */		#endif /* CONFIG_KVM_BOOK3S_64_HV */
	#ifdef CONFIG_KVM_BOOK3S_PR		#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
	struct mutex hpt_mutex;		struct mutex hpt_mutex;
	#endif		#endif
	#ifdef CONFIG_PPC_BOOK3S_64		#ifdef CONFIG_PPC_BOOK3S_64

arch/powerpc/include/asm/paca.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -166,7 +166,7 @@ struct paca_struct {
	struct dtl_entry dtl_curr; / pointer corresponding to dtl_ridx */		struct dtl_entry dtl_curr; / pointer corresponding to dtl_ridx */

	#ifdef CONFIG_KVM_BOOK3S_HANDLER		#ifdef CONFIG_KVM_BOOK3S_HANDLER
	#ifdef CONFIG_KVM_BOOK3S_PR		#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
	/* We use this to store guest state in */		/* We use this to store guest state in */
	struct kvmppc_book3s_shadow_vcpu shadow_vcpu;		struct kvmppc_book3s_shadow_vcpu shadow_vcpu;
	#endif		#endif