KVM: ppc: combine booke_guest.c and booke_host.c
Subsystems (2)
PATCH 1/1 KVM: ppc: combine booke_guest.c and booke_host.c
# HG changeset patch
# User Hollis Blanchard <[email protected]> # Date 1222628029 18000
# Node ID 00752aa374758b6cfcc0d7894b2d7bb4ebfbc775 # Parent e954cb04a648e694f35e2baaa43f430ebc6b65ca
KVM: ppc: combine booke_guest.c and booke_host.c
The division was somewhat artificial and cumbersome, and had no functional benefit anyways: we can only guests built for the real host processor.
Signed-off-by Hollis Blanchard <[email protected]>
arch/powerpc/kvm/Kconfig +3 -3
@@ -20,7 +20,7 @@ config KVM select PREEMPT_NOTIFIERS select ANON_INODES # We can only run on Book E hosts so far - select KVM_BOOKE_HOST + select KVM_BOOKE ---help--- Support hosting virtualized guest machines. You will also need to select one or more of the processor modules below.
@@ -30,8 +30,8 @@ config KVM If unsure, say N. -config KVM_BOOKE_HOST - bool "KVM host support for Book E PowerPC processors" +config KVM_BOOKE + bool "KVM support for Book E PowerPC processors" depends on KVM && 44x ---help--- Provides host support for KVM on Book E PowerPC processors. Currently
arch/powerpc/kvm/Makefile +3 -3
@@ -8,10 +8,10 @@ common-objs-y = $(addprefix ../../../vir common-objs-$(CONFIG_KVM_TRACE) += $(addprefix ../../../virt/kvm/, kvm_trace.o) -kvm-objs := $(common-objs-y) powerpc.o emulate.o booke_guest.o +kvm-objs := $(common-objs-y) powerpc.o emulate.o obj-$(CONFIG_KVM) += kvm.o AFLAGS_booke_interrupts.o := -I$(obj) -kvm-booke-host-objs := booke_host.o booke_interrupts.o 44x_tlb.o -obj-$(CONFIG_KVM_BOOKE_HOST) += kvm-booke-host.o +kvm-booke-objs := booke.o booke_interrupts.o 44x_tlb.o +obj-$(CONFIG_KVM_BOOKE) += kvm-booke.o
arch/powerpc/kvm/booke.c new file +639 -0
639 lines not on this page · raw message
arch/powerpc/kvm/booke_guest.c deleted +0 -579
579 lines not on this page · raw message
arch/powerpc/kvm/booke_host.c deleted +0 -83
83 lines not on this page · raw message