From patchwork Tue Nov 16 11:50:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Woodhouse X-Patchwork-Id: 12692751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97347C433EF for ; Tue, 16 Nov 2021 11:52:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6293261507 for ; Tue, 16 Nov 2021 11:52:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6293261507 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DWXur9JFSF4LBmIXQLdkDSqR6H60Go8QM9aX2PNttDA=; b=mAsjMqN/mSIlpK w7OJt34c75P3Hr6WK3A28xAwJM5loibOPhYi0KNk0KGxuIJWp3tILr96+rqkCReGxWK/w2JoOnlK6 kN+tUGt/HxXMP1VsCj2RwfIjr+0Xf7OxLQVZxLzSY3uzurhoxUT6CeGKKDGCD+Kfb+Zz9w3XFTBFB mqNEp0fLG9t1DVXTmJtz//JSSe5Yl76wOjLExsmeTE2STY1D5muCq304IK4Qi6F4rlA+GIDZ4Dmx5 zXrYHPxfc4crVRnstT3GvCbKMft7UYcnynNWQa6Wmyi6nJ/ZtsAdoPV5K4xLoac4xlvPesNJ+ZTsq HNRrSjSvbBoh0Gt0uKDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmwzV-001Y2D-KH; Tue, 16 Nov 2021 11:51:09 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmwzS-001Y0w-4y; Tue, 16 Nov 2021 11:51:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=O8MDor7s313o19vuUnnSxq6Ja3Km6oPS/hJHp/rZTr0=; b=s3VMTRgs2flk4BjZ93jxnSlIRm og/F8rKMuPPZA/sYa+71+ed0m7Ov8nYbEh5lhPkuAUQJIL/5+oBwz/czuP2umgGjYFEhZffQR5eYx vz8EQChorD2W0AdRU6XC04lci3T3lHmGmJOG+OyCn5Ci0kUI3mtwfUcxZjMnhQvzw3mPrqKmeeWh/ hkj6jOuti0JlBQxjJmQigTUVXmmN2wsmXP0UFqbSqXkAkpMhGv+zIjnbSgkt5/X/+UmD4OdsDdUOu cAuyoBx0oIvZCaaYAv6dMNdN6YMX1yQeTFKFs6b0Nk31IKyAxD6bVw7pwgMN/wNVpp0qBzOG2Mu9C YC7qsWIg==; Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmwzD-006iYl-AU; Tue, 16 Nov 2021 11:50:52 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmwzD-000VDq-HM; Tue, 16 Nov 2021 11:50:51 +0000 From: David Woodhouse To: Paolo Bonzini , kvm Cc: Boris Ostrovsky , Joao Martins , "jmattson @ google . com" , "wanpengli @ tencent . com" , "seanjc @ google . com" , "vkuznets @ redhat . com" , "mtosatti @ redhat . com" , "joro @ 8bytes . org" , karahmed@amazon.com, Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Huacai Chen , Aleksandar Markovic , Michael Ellerman , Benjamin Herrenschmidt , Anup Patel , Christian Borntraeger , kvmarm@lists.cs.columbia.edu, linux-arm-kernel , linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 6/7] KVM: powerpc: Use Makefile.kvm for common files Date: Tue, 16 Nov 2021 11:50:50 +0000 Message-Id: <20211116115051.119956-6-dwmw2@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211116115051.119956-1-dwmw2@infradead.org> References: <5047c2591310e503491850ef683f251395247d50.camel@infradead.org> <20211116115051.119956-1-dwmw2@infradead.org> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: David Woodhouse It's all fairly baroque but in the end, I don't think there's any reason for $(KVM)/irqchip.o to have been handled differently, as they all end up in $(kvm-y) in the end anyway, regardless of whether they get there via $(common-objs-y) and the CPU-specific object lists. The generic Makefile.kvm uses HAVE_KVM_IRQCHIP for irqchip.o instead of HAVE_KVM_IRQ_ROUTING. That change is fine (and arguably correct) because they are both set together for KVM_MPIC, or neither is set. Signed-off-by: David Woodhouse --- arch/powerpc/kvm/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 583c14ef596e..245f59118413 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -4,11 +4,8 @@ # ccflags-y := -Ivirt/kvm -Iarch/powerpc/kvm -KVM := ../../../virt/kvm -common-objs-y = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/binary_stats.o -common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o -common-objs-$(CONFIG_KVM_MMIO) += $(KVM)/coalesced_mmio.o +include $(srctree)/virt/kvm/Makefile.kvm common-objs-y += powerpc.o emulate_loadstore.o obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o @@ -125,7 +122,6 @@ kvm-book3s_32-objs := \ kvm-objs-$(CONFIG_KVM_BOOK3S_32) := $(kvm-book3s_32-objs) kvm-objs-$(CONFIG_KVM_MPIC) += mpic.o -kvm-objs-$(CONFIG_HAVE_KVM_IRQ_ROUTING) += $(KVM)/irqchip.o kvm-objs := $(kvm-objs-m) $(kvm-objs-y)