From: David Woodhouse <dwmw2@infradead.org>
To: Paolo Bonzini <pbonzini@redhat.com>, kvm <kvm@vger.kernel.org>
Cc: Anup Patel <anup.patel@wdc.com>,
"wanpengli @ tencent . com" <wanpengli@tencent.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Joao Martins <joao.m.martins@oracle.com>,
Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu, linux-s390@vger.kernel.org,
"joro @ 8bytes . org" <joro@8bytes.org>,
Huacai Chen <chenhuacai@kernel.org>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
karahmed@amazon.com, Suzuki K Poulose <suzuki.poulose@arm.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
"jmattson @ google . com" <jmattson@google.com>,
"seanjc @ google . com" <seanjc@google.com>,
"mtosatti @ redhat . com" <mtosatti@redhat.com>,
linux-mips@vger.kernel.org, James Morse <james.morse@arm.com>,
kvm-riscv@lists.infradead.org, Marc Zyngier <maz@kernel.org>,
"vkuznets @ redhat . com" <vkuznets@redhat.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 6/7] KVM: powerpc: Use Makefile.kvm for common files
Date: Tue, 16 Nov 2021 11:50:50 +0000 [thread overview]
Message-ID: <20211116115051.119956-6-dwmw2@infradead.org> (raw)
In-Reply-To: <20211116115051.119956-1-dwmw2@infradead.org>
From: David Woodhouse <dwmw@amazon.co.uk>
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 <dwmw@amazon.co.uk>
---
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)
--
2.31.1
next prev parent reply other threads:[~2021-11-16 11:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5d4002373c3ae614cb87b72ba5b7cdc161a0cd46.camel@infradead.org>
[not found] ` <624bc910-1bec-e6dd-b09a-f86dc6cdbef0@redhat.com>
[not found] ` <0372987a52b5f43963721b517664830e7e6f1818.camel@infradead.org>
[not found] ` <1f326c33-3acf-911a-d1ef-c72f0a570761@redhat.com>
[not found] ` <3645b9b889dac6438394194bb5586a46b68d581f.camel@infradead.org>
[not found] ` <309f61f7-72fd-06a2-84b4-97dfc3fab587@redhat.com>
[not found] ` <96cef64bf7927b6a0af2173b0521032f620551e4.camel@infradead.org>
[not found] ` <40d7d808-dce6-a541-18dc-b0c7f4d6586c@redhat.com>
[not found] ` <2b400dbb16818da49fb599b9182788ff9896dcda.camel@infradead.org>
[not found] ` <32b00203-e093-8ffc-a75b-27557b5ee6b1@redhat.com>
[not found] ` <28435688bab2dc1e272acc02ce92ba9a7589074f.camel@infradead.org>
[not found] ` <4c37db19-14ed-46b8-eabe-0381ba879e5c@redhat.com>
[not found] ` <537fdcc6af80ba6285ae0cdecdb615face25426f.camel@infradead.org>
[not found] ` <7e4b895b-8f36-69cb-10a9-0b4139b9eb79@redhat.com>
[not found] ` <95fae9cf56b1a7f0a5f2b9a1934e29e924908ff2.camel@infradead.org>
[not found] ` <3a2a9a8c-db98-b770-78e2-79f5880ce4ed@redhat.com>
[not found] ` <2c7eee5179d67694917a5a0d10db1bce24af61bf.camel@infradead.org>
[not found] ` <537a1d4e-9168-cd4a-cd2f-cddfd8733b05@redhat.com>
2021-11-16 11:50 ` [PATCH 0/7] KVM: Add Makefile.kvm for common files David Woodhouse
2021-11-16 11:50 ` [PATCH 1/7] KVM: Introduce CONFIG_HAVE_KVM_DIRTY_RING David Woodhouse
2021-11-16 11:50 ` [PATCH 2/7] KVM: Add Makefile.kvm for common files, use it for x86 David Woodhouse
2021-11-16 11:50 ` [PATCH 3/7] KVM: s390: Use Makefile.kvm for common files David Woodhouse
2021-11-17 7:29 ` Christian Borntraeger
2021-11-16 11:50 ` [PATCH 4/7] KVM: mips: " David Woodhouse
2021-11-16 11:50 ` [PATCH 5/7] KVM: RISC-V: " David Woodhouse
2021-11-16 11:50 ` David Woodhouse [this message]
2021-11-16 18:43 ` [PATCH 6/7] KVM: powerpc: " Sean Christopherson
2021-11-16 19:13 ` David Woodhouse
2021-11-16 11:50 ` [PATCH 7/7] KVM: arm64: " David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211116115051.119956-6-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=alexandru.elisei@arm.com \
--cc=anup.patel@wdc.com \
--cc=boris.ostrovsky@oracle.com \
--cc=borntraeger@de.ibm.com \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=james.morse@arm.com \
--cc=jmattson@google.com \
--cc=joao.m.martins@oracle.com \
--cc=joro@8bytes.org \
--cc=karahmed@amazon.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maz@kernel.org \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).