[PATCH kernel 02/15] KVM: PPC: Finish enabling VFIO KVM device on POWER
flat view
STALE3659d
SUPERSEDED
From: Alexey Kardashevskiy <hidden>
Date: 2016-08-03 08:41:38
Subsystem:
kernel virtual machine for powerpc (kvm/powerpc), linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
Revision v1 of 11 in this series.
Revisions (11)
178a787502 "vfio: Enable VFIO device for powerpc" made an attempt to enable VFIO KVM device on POWER. However as CONFIG_KVM_BOOK3S_64 does not use "common-objs-y", VFIO KVM device was not enabled for Book3s KVM, this adds VFIO to the kvm-book3s_64-objs-y list. While we are here, enforce KVM_VFIO on KVM_BOOK3S as other platforms already do. Signed-off-by: Alexey Kardashevskiy <redacted> --- arch/powerpc/kvm/Kconfig | 1 + arch/powerpc/kvm/Makefile | 3 +++ 2 files changed, 4 insertions(+)
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index c2024ac..b7c494b 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig@@ -64,6 +64,7 @@ config KVM_BOOK3S_64 select KVM_BOOK3S_64_HANDLER select KVM select KVM_BOOK3S_PR_POSSIBLE if !KVM_BOOK3S_HV_POSSIBLE + select KVM_VFIO if VFIO ---help--- Support running unmodified book3s_64 and book3s_32 guest kernels in virtual machines on book3s_64 host processors.
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 1f9e552..8907af9 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile@@ -88,6 +88,9 @@ endif kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \ book3s_xics.o +kvm-book3s_64-objs-$(CONFIG_KVM_VFIO) += \ + $(KVM)/vfio.o + kvm-book3s_64-module-objs += \ $(KVM)/kvm_main.o \ $(KVM)/eventfd.o \
--
2.5.0.rc3