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

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

KVM: PPC: rename CONFIG_KVM_E500 -> CONFIG_KVM_E500V2 



The CONFIG_KVM_E500 option really indicates that we're running on a V2 machine,
not on a machine of the generic E500 class. So indicate that properly and
change the config name accordingly.

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

arch/powerpc/kvm/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ config KVM_440 


config KVM_EXIT_TIMING

	bool "Detailed exit timing"

	depends on KVM_440 || KVM_E500 || KVM_E500MC

	depends on KVM_440 || KVM_E500V2 || KVM_E500MC

	---help---

	  Calculate elapsed time for every exit/enter cycle. A per-vcpu

	  report is available in debugfs kvm/vm#_vcpu#_timing.
@@ -118,14 +118,14 @@ config KVM_EXIT_TIMING 


	  If unsure, say N.



config KVM_E500

	bool "KVM support for PowerPC E500 processors"

config KVM_E500V2

	bool "KVM support for PowerPC E500v2 processors"

	depends on EXPERIMENTAL && E500

	select KVM

	select KVM_MMIO

	---help---

	  Support running unmodified E500 guest kernels in virtual machines on

	  E500 host processors.

	  E500v2 host processors.



	  This module provides access to the hardware capabilities through

	  a character device node named /dev/kvm.

arch/powerpc/kvm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ kvm-e500-objs := \ 
	e500.o \

	e500_tlb.o \

	e500_emulate.o

kvm-objs-$(CONFIG_KVM_E500) := $(kvm-e500-objs)

kvm-objs-$(CONFIG_KVM_E500V2) := $(kvm-e500-objs)



kvm-e500mc-objs := \

	$(common-objs-y) \
@@ -98,7 +98,7 @@ kvm-objs-$(CONFIG_KVM_BOOK3S_32) := $(kvm-book3s_32-objs) 
kvm-objs := $(kvm-objs-m) $(kvm-objs-y)



obj-$(CONFIG_KVM_440) += kvm.o

obj-$(CONFIG_KVM_E500) += kvm.o

obj-$(CONFIG_KVM_E500V2) += kvm.o

obj-$(CONFIG_KVM_E500MC) += kvm.o

obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o

obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o

arch/powerpc/kvm/booke.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		gpa_t gpaddr;

		gfn_t gfn;



#ifdef CONFIG_KVM_E500

#ifdef CONFIG_KVM_E500V2

		if (!(vcpu->arch.shared->msr & MSR_PR) &&

		    (eaddr & PAGE_MASK) == vcpu->arch.magic_page_ea) {

			kvmppc_map_magic(vcpu);

arch/powerpc/kvm/e500.h

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct tlbe_priv { 
	struct tlbe_ref ref; /* TLB0 only -- TLB1 uses tlb_refs */

};



#ifdef CONFIG_KVM_E500

#ifdef CONFIG_KVM_E500V2

struct vcpu_id_table;

#endif
@@ -89,7 +89,7 @@ struct kvmppc_vcpu_e500 { 
	u64 *g2h_tlb1_map;

	unsigned int *h2g_tlb1_rmap;



#ifdef CONFIG_KVM_E500

#ifdef CONFIG_KVM_E500V2

	u32 pid[E500_PID_NUM];



	/* vcpu id table */
@@ -136,7 +136,7 @@ void kvmppc_get_sregs_e500_tlb(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); 
int kvmppc_set_sregs_e500_tlb(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);





#ifdef CONFIG_KVM_E500

#ifdef CONFIG_KVM_E500V2

unsigned int kvmppc_e500_get_sid(struct kvmppc_vcpu_e500 *vcpu_e500,

				 unsigned int as, unsigned int gid,

				 unsigned int pr, int avoid_recursion);

arch/powerpc/kvm/e500_tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static inline void write_host_tlbe(struct kvmppc_vcpu_e500 *vcpu_e500, 
	}

}



#ifdef CONFIG_KVM_E500

#ifdef CONFIG_KVM_E500V2

void kvmppc_map_magic(struct kvm_vcpu *vcpu)

{

	struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);