Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20C60C54FD0 for ; Tue, 21 Apr 2020 13:17:54 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id CD19D20775 for ; Tue, 21 Apr 2020 13:17:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="rleQNh21" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD19D20775 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 795134B14A; Tue, 21 Apr 2020 09:17:53 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, body has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AUiys2WSTMn1; Tue, 21 Apr 2020 09:17:52 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3EE634B15B; Tue, 21 Apr 2020 09:17:52 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 871D84B125 for ; Tue, 21 Apr 2020 09:17:50 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5la24HreI2Is for ; Tue, 21 Apr 2020 09:17:49 -0400 (EDT) Received: from mail-ua1-f74.google.com (mail-ua1-f74.google.com [209.85.222.74]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 8E3B74B0A5 for ; Tue, 21 Apr 2020 09:17:49 -0400 (EDT) Received: by mail-ua1-f74.google.com with SMTP id n36so6377352uan.1 for ; Tue, 21 Apr 2020 06:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=YNgVNR1kpgcs//Lp+iBulN2FIYTwJk3RZtJXPk8cVwI=; b=rleQNh21YJL8C/c3kivf5EWhXZ9j1Ah3h5r3up/XMUmncI3uXCuK7rWeb2vyh9CMz3 MPYuAnRq5EmVh3RUEfCLGMEeP61JW0SAcbUqQWoqHbUztByw5nZlQE4DrSf6Xld9usjV paeoDg+EUI7Cs0kovIIzXRChp2SA0PdB4MmeSLhXKHQZCJ8jKuzW+6f/rbLDexf/tRyn Mcj918usCuFdMTZ9vTjW522KwutpUBM1PfAnuuzpoj5zzvBpFTCeB2LTM7L4YcSyHK1X ACidzwivmpiRbeNjsBd5RnKesMP/eOwC42zJx0e9dTSsIJSxmKUE8u15MveDI1QImYue oJ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=YNgVNR1kpgcs//Lp+iBulN2FIYTwJk3RZtJXPk8cVwI=; b=XwayLCzLL2ZBy/bnCwSU7pbiGU0vU81/UfABZ7DXKKYoa54X+QDLAwOlATmPSWY00q IBqa8V9cUhRHkXS1XF1hM/G3dKa5L/rBERGMGr/OSc3//mDRdLLpLvZ28W+348PcMi4D oS7oBPqqlSLpAlzRNeIglJMiIzmoe7WcSDELXPEoR/biZo6oiKpbelb8AM8BnJLlqNDa TiAI4ilzGcBqBglzTwKF4IpWmtRz7NrBLwiq0y+ZV9qewyBBLP5ecV/Dau1QMt9RfzSh 7irTx3c7fn435mNZbRitQ4/f5ca5TyGEy5aa9KJowUwtjnqhziIHHTuuzIM3Yh3Fq3s0 zctA== X-Gm-Message-State: AGi0PuYZ7O4kYV913hooxe88rfYwGDbMiZLNnEmnD0Q7wZQ5F0yak8R4 1MyamxbzEHSYLIrbQ/fmOrcF7dBUTg== X-Google-Smtp-Source: APiQypLTAGelp+xWRsCdTFhWjCu4/dgjxNDshanB1UMqrLFZtydhlTfsbDPQkzVJD/I2x0p9FYrCeOCvcg== X-Received: by 2002:ab0:30ee:: with SMTP id d14mr12147183uam.85.1587475068926; Tue, 21 Apr 2020 06:17:48 -0700 (PDT) Date: Tue, 21 Apr 2020 14:17:34 +0100 In-Reply-To: <20200421131734.141766-1-tabba@google.com> Message-Id: <20200421131734.141766-5-tabba@google.com> Mime-Version: 1.0 References: <20200421131734.141766-1-tabba@google.com> X-Mailer: git-send-email 2.26.1.301.g55bc3eb7cb9-goog Subject: [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles From: Fuad Tabba To: maz@kernel.org, catalin.marinas@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kvmarm@lists.cs.columbia.edu Cc: will@kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Consolidate references to the CONFIG_KVM configuration item to encompass entire folders rather than per line. Signed-off-by: Fuad Tabba --- 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 \ + aarch32.o arch_timer.o \ + vgic/vgic.o vgic/vgic-init.o \ + vgic/vgic-irqfd.o vgic/vgic-v2.o \ + vgic/vgic-v3.o vgic/vgic-v4.o \ + vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \ + vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \ + vgic/vgic-its.o vgic/vgic-debug.o diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 8229e47ba870..529aecbd0231 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -6,17 +6,10 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ $(DISABLE_STACKLEAK_PLUGIN) -obj-$(CONFIG_KVM) += vgic-v3-sr.o -obj-$(CONFIG_KVM) += timer-sr.o -obj-$(CONFIG_KVM) += aarch32.o -obj-$(CONFIG_KVM) += vgic-v2-cpuif-proxy.o -obj-$(CONFIG_KVM) += sysreg-sr.o -obj-$(CONFIG_KVM) += debug-sr.o -obj-$(CONFIG_KVM) += entry.o -obj-$(CONFIG_KVM) += switch.o -obj-$(CONFIG_KVM) += fpsimd.o -obj-$(CONFIG_KVM) += tlb.o -obj-$(CONFIG_KVM) += hyp-entry.o +obj-$(CONFIG_KVM) += hyp.o + +hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o sysreg-sr.o \ + debug-sr.o entry.o switch.o fpsimd.o tlb.o hyp-entry.o # KVM code is run at a different exception code with a different map, so # compiler instrumentation that inserts callbacks or checks into the code may -- 2.26.1.301.g55bc3eb7cb9-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm