From nobody Wed Jan 15 13:39:48 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705486673841620.292083623461; Wed, 17 Jan 2024 02:17:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9A8121E73; Wed, 17 Jan 2024 05:17:52 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4BB751DF6; Wed, 17 Jan 2024 04:56:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9AA6B1D76; Wed, 17 Jan 2024 04:55:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F20291CAA for ; Wed, 17 Jan 2024 04:55:03 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-30-IijE539gPj2iqYhpvQeAKQ-1; Wed, 17 Jan 2024 04:55:02 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5DDD830E59 for ; Wed, 17 Jan 2024 09:55:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.208]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C43B40C6E2B for ; Wed, 17 Jan 2024 09:55:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: IijE539gPj2iqYhpvQeAKQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 12/18] qemu: Move qemuDomainSupportsPCIMultibus() Date: Wed, 17 Jan 2024 10:54:45 +0100 Message-ID: <20240117095451.788816-13-abologna@redhat.com> In-Reply-To: <20240117095451.788816-1-abologna@redhat.com> References: <20240117095451.788816-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: JXJOZOE5XNIT2PFAZYAY2G3KLBOVYQ2Q X-Message-ID-Hash: JXJOZOE5XNIT2PFAZYAY2G3KLBOVYQ2Q X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705486675008100001 It belongs next to qemuDomainSupportsPCI(). Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_capabilities.c | 28 ---------------------------- src/qemu/qemu_capabilities.h | 2 -- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 29 +++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 1 + 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index e58c488f8a..686b5a4d80 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -142,7 +142,7 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef, return; =20 if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if (!virQEMUCapsHasPCIMultiBus(domainDef)) { + if (!qemuDomainSupportsPCIMultibus(domainDef)) { /* qemus that don't support multiple PCI buses have * hardcoded the name of their single PCI controller as * "pci". diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index dc192b3729..98faf3f1d3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2059,34 +2059,6 @@ virQEMUCapsGet(virQEMUCaps *qemuCaps, } =20 =20 -bool virQEMUCapsHasPCIMultiBus(const virDomainDef *def) -{ - /* x86_64 and i686 support PCI-multibus on all machine types - * since forever */ - if (ARCH_IS_X86(def->os.arch)) - return true; - - /* PPC supports multibus on all machine types which have pci since qem= u-2.0.0 */ - if (def->os.arch =3D=3D VIR_ARCH_PPC || - ARCH_IS_PPC64(def->os.arch)) { - return true; - } - - /* S390 supports PCI-multibus. */ - if (ARCH_IS_S390(def->os.arch)) - return true; - - /* If the virt machine, both on ARM and RISC-V, supports PCI, - * then it also supports multibus */ - if (qemuDomainIsARMVirt(def) || - qemuDomainIsRISCVVirt(def)) { - return true; - } - - return false; -} - - const char *virQEMUCapsGetBinary(virQEMUCaps *qemuCaps) { return qemuCaps->binary; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 038ab0a4df..4693e2f4de 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -701,8 +701,6 @@ bool virQEMUCapsGet(virQEMUCaps *qemuCaps, =20 void virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps); =20 -bool virQEMUCapsHasPCIMultiBus(const virDomainDef *def); - bool virQEMUCapsSupportsVmport(virQEMUCaps *qemuCaps, const virDomainDef *def); =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2a4e1088b..dcc2e45cf4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -386,7 +386,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *dom= ainDef, * */ if (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROO= T && contTargetIndex <=3D 0) { - if (virQEMUCapsHasPCIMultiBus(domainDef)) + if (qemuDomainSupportsPCIMultibus(domainDef)) contAlias =3D "pci.0"; else contAlias =3D "pci"; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 80281d9b48..ef7506258a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9085,6 +9085,35 @@ qemuDomainSupportsPCI(const virDomainDef *def) } =20 =20 +bool +qemuDomainSupportsPCIMultibus(const virDomainDef *def) +{ + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever */ + if (ARCH_IS_X86(def->os.arch)) + return true; + + /* PPC supports multibus on all machine types which have pci since qem= u-2.0.0 */ + if (def->os.arch =3D=3D VIR_ARCH_PPC || + ARCH_IS_PPC64(def->os.arch)) { + return true; + } + + /* S390 supports PCI-multibus. */ + if (ARCH_IS_S390(def->os.arch)) + return true; + + /* If the virt machine, both on ARM and RISC-V, supports PCI, + * then it also supports multibus */ + if (qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def)) { + return true; + } + + return false; +} + + static int qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, const virDomainDef *def) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 49e0fcf498..b4512cc80e 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -835,6 +835,7 @@ bool qemuDomainHasBuiltinIDE(const virDomainDef *def); bool qemuDomainHasBuiltinESP(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); bool qemuDomainSupportsPCI(const virDomainDef *def); +bool qemuDomainSupportsPCIMultibus(const virDomainDef *def); =20 void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org