Commit 9ed24f4b authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Move virt/kvm/arm to arch/arm64 



Now that the 32bit KVM/arm host is a distant memory, let's move the
whole of the KVM/arm64 code into the arm64 tree.

As they said in the song: Welcome Home (Sanitarium).

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200513104034.74741-1-maz@kernel.org
parent 2ef96a5b

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9295,7 +9295,6 @@ F: arch/arm64/include/asm/kvm* 
F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/kvm/

F:	include/kvm/arm_*

F:	virt/kvm/arm/









KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)









L:	linux-mips@vger.kernel.org
































arch/arm64/kvm/Makefile



+22
−22






























Original line number
Diff line number
Diff line







@@ -3,37 +3,37 @@







# Makefile for Kernel-based Virtual Machine module









#



















ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic









ccflags-y += -I $(srctree)/$(src)



















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



















obj-$(CONFIG_KVM_ARM_HOST) += kvm.o









obj-$(CONFIG_KVM_ARM_HOST) += hyp/



















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









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









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









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hypercalls.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/pvtime.o









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









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









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









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









kvm-$(CONFIG_KVM_ARM_HOST) += hypercalls.o









kvm-$(CONFIG_KVM_ARM_HOST) += pvtime.o



















kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o









kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o









kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic-sys-reg-v3.o fpsimd.o pmu.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o









kvm-$(CONFIG_KVM_ARM_HOST) += aarch32.o









kvm-$(CONFIG_KVM_ARM_HOST) += arch_timer.o









kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o



















kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-irqfd.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v2.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v3.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v4.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-kvm-device.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-its.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-debug.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/irqchip.o









kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o









kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o








kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-init.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-irqfd.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v2.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v3.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v4.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio-v2.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio-v3.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-kvm-device.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-its.o









kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-debug.o
























virt/kvm/arm/aarch32.c→arch/arm64/kvm/aarch32.c



+0
−0




























File moved.





View file




























virt/kvm/arm/arm.c→arch/arm64/kvm/arm.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -22,7 +22,7 @@







#include <trace/events/kvm.h>



















#define CREATE_TRACE_POINTS









#include "trace.h"









#include "trace_arm.h"



















#include <linux/uaccess.h>









#include <asm/ptrace.h>








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE