KVM: PPC: Enable Book3S_32 KVM building

Now that we have all the bits and pieces in place, let's enable building
of the Book3S_32 target.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index d864698860c66199f14af8874187cf901c9022e3..b7baff78f90ca174fd24c66675cdffe0250cb702 100644 (file)
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -25,10 +25,28 @@ config KVM
 config KVM_BOOK3S_HANDLER
        bool
 
+config KVM_BOOK3S_32_HANDLER
+       bool
+       select KVM_BOOK3S_HANDLER
+
 config KVM_BOOK3S_64_HANDLER
        bool
        select KVM_BOOK3S_HANDLER
 
+config KVM_BOOK3S_32
+       tristate "KVM support for PowerPC book3s_32 processors"
+       depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT
+       select KVM
+       select KVM_BOOK3S_32_HANDLER
+       ---help---
+         Support running unmodified book3s_32 guest kernels
+         in virtual machines on book3s_32 host processors.
+
+         This module provides access to the hardware capabilities through
+         a character device node named /dev/kvm.
+
+         If unsure, say N.
+
 config KVM_BOOK3S_64
        tristate "KVM support for PowerPC book3s_64 processors"
        depends on EXPERIMENTAL && PPC_BOOK3S_64

diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index f621ce64363bb0823f4ea153c11d35e8647161d8..ff436066bf776f4677d7f853ab158631f753ea4f 100644 (file)
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -50,9 +50,21 @@ kvm-book3s_64-objs := \
        book3s_32_mmu.o
 kvm-objs-$(CONFIG_KVM_BOOK3S_64) := $(kvm-book3s_64-objs)
 
+kvm-book3s_32-objs := \
+       $(common-objs-y) \
+       fpu.o \
+       book3s_paired_singles.o \
+       book3s.o \
+       book3s_emulate.o \
+       book3s_interrupts.o \
+       book3s_32_mmu_host.o \
+       book3s_32_mmu.o
+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_BOOK3S_64) += kvm.o
+obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o