Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8889583c authored by Kim Phillips's avatar Kim Phillips Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Enable the KVM-VFIO device 



The KVM-VFIO device is used by the QEMU VFIO device. It is used to
record the list of in-use VFIO groups so that KVM can manipulate
them.

Signed-off-by: default avatarKim Phillips <kim.phillips@linaro.org>
Signed-off-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 1b3d546d

arch/arm/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config KVM 
	select KVM_GENERIC_DIRTYLOG_READ_PROTECT

	select SRCU

	select MMU_NOTIFIER

	select KVM_VFIO

	select HAVE_KVM_EVENTFD

	select HAVE_KVM_IRQFD

	depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER

arch/arm/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt) 
AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt)



KVM := ../../../virt/kvm

kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o

kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o



obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o

arch/arm64/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config KVM 
	select KVM_ARM_HOST

	select KVM_GENERIC_DIRTYLOG_READ_PROTECT

	select SRCU

	select KVM_VFIO

	select HAVE_KVM_EVENTFD

	select HAVE_KVM_IRQFD

	---help---

arch/arm64/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ ARM=../../../arch/arm/kvm 


obj-$(CONFIG_KVM_ARM_HOST) += kvm.o



kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/arm.o $(ARM)/mmu.o $(ARM)/mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o