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

KVM: PPC: Use KVM_BOOK3S_HANDLER 



So far we had a lot of conditional code on CONFIG_KVM_BOOK3S_64_HANDLER.
As we're moving towards common code between 32 and 64 bits, most of
these ifdefs can be moved to a more generic term define, called
CONFIG_KVM_BOOK3S_HANDLER.

This patch adds the new generic config option and moves ifdefs over.

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

arch/powerpc/include/asm/kvm_book3s_asm.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#ifdef __ASSEMBLY__



#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

#ifdef CONFIG_KVM_BOOK3S_HANDLER



#include <asm/kvm_asm.h>
@@ -55,7 +55,7 @@ kvmppc_resume_\intno: 
.macro DO_KVM intno

.endm



#endif /* CONFIG_KVM_BOOK3S_64_HANDLER */

#endif /* CONFIG_KVM_BOOK3S_HANDLER */



#else  /*__ASSEMBLY__ */

arch/powerpc/include/asm/paca.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct paca_struct { 
	u64 startpurr;			/* PURR/TB value snapshot */

	u64 startspurr;			/* SPURR value snapshot */



#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

#ifdef CONFIG_KVM_BOOK3S_HANDLER

	struct  {

		u64     esid;

		u64     vsid;

arch/powerpc/kvm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -22,8 +22,12 @@ config KVM 
	select ANON_INODES

	select KVM_MMIO



config KVM_BOOK3S_HANDLER

	bool



config KVM_BOOK3S_64_HANDLER

	bool

	select KVM_BOOK3S_HANDLER



config KVM_BOOK3S_64

	tristate "KVM support for PowerPC book3s_64 processors"

arch/powerpc/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CFLAGS_emulate.o := -I. 


common-objs-y += powerpc.o emulate.o

obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o

obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_exports.o

obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o



AFLAGS_booke_interrupts.o := -I$(obj)