Commit 6f2cdbdb authored by David Woodhouse's avatar David Woodhouse Committed by Paolo Bonzini
Browse files

KVM: Add Makefile.kvm for common files, use it for x86 



Splitting kvm_main.c out into smaller and better-organized files is
slightly non-trivial when it involves editing a bunch of per-arch
KVM makefiles. Provide virt/kvm/Makefile.kvm for them to include.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Message-Id: <20211121125451.9489-3-dwmw2@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dc70ec21

arch/x86/kvm/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -7,12 +7,7 @@ ifeq ($(CONFIG_FRAME_POINTER),y) 
OBJECT_FILES_NON_STANDARD_vmenter.o := y

endif



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



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

				$(KVM)/eventfd.o $(KVM)/irqchip.o $(KVM)/vfio.o \

				$(KVM)/dirty_ring.o $(KVM)/binary_stats.o

kvm-$(CONFIG_KVM_ASYNC_PF)	+= $(KVM)/async_pf.o

include $(srctree)/virt/kvm/Makefile.kvm



kvm-y			+= x86.o emulate.o i8259.o irq.o lapic.o \

			   i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \

virt/kvm/Makefile.kvm

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for Kernel-based Virtual Machine module

#



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



kvm-y := $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/binary_stats.o

kvm-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o

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

kvm-$(CONFIG_KVM_ASYNC_PF) += $(KVM)/async_pf.o

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

kvm-$(CONFIG_HAVE_KVM_DIRTY_RING) += $(KVM)/dirty_ring.o