aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2013-10-07 12:47:51 -0400
committerAlexander Graf <agraf@suse.de>2013-10-17 09:17:49 -0400
commit7aa79938f7d76f5865d0b2a2d9bbe2337560261f (patch)
tree44e98c8e6206fc560b7923024257fa1bdc0be3af /arch/powerpc/kvm
parent066212e02a8fb4ae797fae1d7cede5807ba398e1 (diff)
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>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/Kconfig6
-rw-r--r--arch/powerpc/kvm/trace.h10
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index ffaef2cb101a..d0665f231e6f 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -34,7 +34,7 @@ config KVM_BOOK3S_64_HANDLER
34 bool 34 bool
35 select KVM_BOOK3S_HANDLER 35 select KVM_BOOK3S_HANDLER
36 36
37config KVM_BOOK3S_PR 37config KVM_BOOK3S_PR_POSSIBLE
38 bool 38 bool
39 select KVM_MMIO 39 select KVM_MMIO
40 select MMU_NOTIFIER 40 select MMU_NOTIFIER
@@ -44,7 +44,7 @@ config KVM_BOOK3S_32
44 depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT 44 depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT
45 select KVM 45 select KVM
46 select KVM_BOOK3S_32_HANDLER 46 select KVM_BOOK3S_32_HANDLER
47 select KVM_BOOK3S_PR 47 select KVM_BOOK3S_PR_POSSIBLE
48 ---help--- 48 ---help---
49 Support running unmodified book3s_32 guest kernels 49 Support running unmodified book3s_32 guest kernels
50 in virtual machines on book3s_32 host processors. 50 in virtual machines on book3s_32 host processors.
@@ -91,7 +91,7 @@ config KVM_BOOK3S_64_HV
91config KVM_BOOK3S_64_PR 91config KVM_BOOK3S_64_PR
92 def_bool y 92 def_bool y
93 depends on KVM_BOOK3S_64 && !KVM_BOOK3S_64_HV 93 depends on KVM_BOOK3S_64 && !KVM_BOOK3S_64_HV
94 select KVM_BOOK3S_PR 94 select KVM_BOOK3S_PR_POSSIBLE
95 95
96config KVM_BOOKE_HV 96config KVM_BOOKE_HV
97 bool 97 bool
diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h
index a088e9a8c103..9e8368edf371 100644
--- a/arch/powerpc/kvm/trace.h
+++ b/arch/powerpc/kvm/trace.h
@@ -94,7 +94,7 @@ TRACE_EVENT(kvm_exit,
94 __field( unsigned long, pc ) 94 __field( unsigned long, pc )
95 __field( unsigned long, msr ) 95 __field( unsigned long, msr )
96 __field( unsigned long, dar ) 96 __field( unsigned long, dar )
97#ifdef CONFIG_KVM_BOOK3S_PR 97#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
98 __field( unsigned long, srr1 ) 98 __field( unsigned long, srr1 )
99#endif 99#endif
100 __field( unsigned long, last_inst ) 100 __field( unsigned long, last_inst )
@@ -105,7 +105,7 @@ TRACE_EVENT(kvm_exit,
105 __entry->pc = kvmppc_get_pc(vcpu); 105 __entry->pc = kvmppc_get_pc(vcpu);
106 __entry->dar = kvmppc_get_fault_dar(vcpu); 106 __entry->dar = kvmppc_get_fault_dar(vcpu);
107 __entry->msr = vcpu->arch.shared->msr; 107 __entry->msr = vcpu->arch.shared->msr;
108#ifdef CONFIG_KVM_BOOK3S_PR 108#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
109 __entry->srr1 = vcpu->arch.shadow_srr1; 109 __entry->srr1 = vcpu->arch.shadow_srr1;
110#endif 110#endif
111 __entry->last_inst = vcpu->arch.last_inst; 111 __entry->last_inst = vcpu->arch.last_inst;
@@ -115,7 +115,7 @@ TRACE_EVENT(kvm_exit,
115 " | pc=0x%lx" 115 " | pc=0x%lx"
116 " | msr=0x%lx" 116 " | msr=0x%lx"
117 " | dar=0x%lx" 117 " | dar=0x%lx"
118#ifdef CONFIG_KVM_BOOK3S_PR 118#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
119 " | srr1=0x%lx" 119 " | srr1=0x%lx"
120#endif 120#endif
121 " | last_inst=0x%lx" 121 " | last_inst=0x%lx"
@@ -124,7 +124,7 @@ TRACE_EVENT(kvm_exit,
124 __entry->pc, 124 __entry->pc,
125 __entry->msr, 125 __entry->msr,
126 __entry->dar, 126 __entry->dar,
127#ifdef CONFIG_KVM_BOOK3S_PR 127#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
128 __entry->srr1, 128 __entry->srr1,
129#endif 129#endif
130 __entry->last_inst 130 __entry->last_inst
@@ -236,7 +236,7 @@ TRACE_EVENT(kvm_check_requests,
236 * Book3S trace points * 236 * Book3S trace points *
237 *************************************************************************/ 237 *************************************************************************/
238 238
239#ifdef CONFIG_KVM_BOOK3S_PR 239#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
240 240
241TRACE_EVENT(kvm_book3s_reenter, 241TRACE_EVENT(kvm_book3s_reenter,
242 TP_PROTO(int r, struct kvm_vcpu *vcpu), 242 TP_PROTO(int r, struct kvm_vcpu *vcpu),