Hi, On Mon, May 4, 2020 at 4:27 PM Marc Zyngier <maz@xxxxxxxxxx> wrote: > > Hi all, > > On 2020-05-04 14:26, Quentin Perret wrote: > > Hi Fuad, > > > > On Tuesday 21 Apr 2020 at 14:17:34 (+0100), Fuad Tabba wrote: > >> Consolidate references to the CONFIG_KVM configuration item to > >> encompass > >> entire folders rather than per line. > >> > >> Signed-off-by: Fuad Tabba <tabba@xxxxxxxxxx> > >> --- > >> arch/arm64/kvm/Makefile | 40 > >> ++++++++++++------------------------- > >> arch/arm64/kvm/hyp/Makefile | 15 ++++---------- > >> 2 files changed, 17 insertions(+), 38 deletions(-) > >> > >> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile > >> index 419696e615b3..5354ca1b1bfb 100644 > >> --- a/arch/arm64/kvm/Makefile > >> +++ b/arch/arm64/kvm/Makefile > >> @@ -10,30 +10,16 @@ KVM=../../../virt/kvm > >> obj-$(CONFIG_KVM) += kvm.o > >> obj-$(CONFIG_KVM) += hyp/ > >> > >> -kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o > >> -kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o > >> -kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o > >> -kvm-$(CONFIG_KVM) += psci.o perf.o > >> -kvm-$(CONFIG_KVM) += hypercalls.o > >> -kvm-$(CONFIG_KVM) += pvtime.o > >> - > >> -kvm-$(CONFIG_KVM) += inject_fault.o regmap.o va_layout.o > >> -kvm-$(CONFIG_KVM) += hyp.o hyp-init.o handle_exit.o > >> -kvm-$(CONFIG_KVM) += guest.o debug.o reset.o sys_regs.o > >> sys_regs_generic_v8.o > >> -kvm-$(CONFIG_KVM) += vgic-sys-reg-v3.o fpsimd.o pmu.o > >> -kvm-$(CONFIG_KVM) += aarch32.o > >> -kvm-$(CONFIG_KVM) += arch_timer.o > >> -kvm-$(CONFIG_KVM_ARM_PMU) += pmu-emul.o > >> - > >> -kvm-$(CONFIG_KVM) += vgic/vgic.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-init.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-v2.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-v3.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-v4.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-its.o > >> -kvm-$(CONFIG_KVM) += vgic/vgic-debug.o > >> +kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \ > >> + $(KVM)/vfio.o $(KVM)/irqchip.o \ > >> + arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \ > >> + inject_fault.o regmap.o va_layout.o hyp.o hyp-init.o handle_exit.o > >> \ > >> + guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o \ > >> + vgic-sys-reg-v3.o fpsimd.o pmu.o pmu-emul.o \ > > > > Should we keep pmu-emul.o conditional on CONFIG_KVM_ARM_PMU? > > Good point. KVM_ARM_PMU depends on HW_PERF_EVENTS, which depends > on ARM_PMU. Without the above condition being present, you can > try and build the kernel with the KVM PMU emulation, and not > the host CPU PMU. It stops building very quickly. > > I guess we should clean this up now that 32 bit is gone. But > for the sake of this series, it would be better to keep the > dependency in place and sort out the PMU mess at a later stage. Of course. I will fix this and send out a new patch series. Cheers, /fuad _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
