| Message ID | 1470213656-1042-3-git-send-email-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, Aug 03, 2016 at 06:40:43PM +1000, Alexey Kardashevskiy wrote: > 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 <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> This should be merged regardless of the rest of the series. There's no reason not to include the kvm device on Power, and it makes life easier for userspace because it doens't have to have conditionals about whether to instantiate it or not. > --- > 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 \
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 \
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 <aik@ozlabs.ru> --- arch/powerpc/kvm/Kconfig | 1 + arch/powerpc/kvm/Makefile | 3 +++ 2 files changed, 4 insertions(+)