From nobody Wed Jan 15 13:46:13 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 170548697715797.36187962285419; Wed, 17 Jan 2024 02:22:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0F5F11BEA; Wed, 17 Jan 2024 05:22:56 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A5E791E86; Wed, 17 Jan 2024 04:56:35 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2C3161D51; Wed, 17 Jan 2024 04:55:08 -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 0507B1D5B for ; Wed, 17 Jan 2024 04:55:04 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-9FAQaMMkOCOCireGVSn9Gg-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 9BC331C04185 for ; Wed, 17 Jan 2024 09:55:02 +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 3309A40C6EB9 for ; Wed, 17 Jan 2024 09:55:02 +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: 9FAQaMMkOCOCireGVSn9Gg-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 13/18] qemu: Improve qemuDomainSupportsPCIMultibus() Date: Wed, 17 Jan 2024 10:54:46 +0100 Message-ID: <20240117095451.788816-14-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: C37P4UZLMO6C46SOXB4QGCMCF7UVMCAV X-Message-ID-Hash: C37P4UZLMO6C46SOXB4QGCMCF7UVMCAV 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: 1705486978150100001 Rewrite the function so that it's more compact and easier to extend as new architectures, which will likely come with multibus support right out the gate, are introduced. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ef7506258a..de36641137 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9088,23 +9088,16 @@ qemuDomainSupportsPCI(const virDomainDef *def) 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)) { + /* Most architectures support multibus for all machine types on + * all supported QEMU versions */ + if (ARCH_IS_X86(def->os.arch) || + ARCH_IS_PPC(def->os.arch) || + ARCH_IS_S390(def->os.arch)) { return true; } =20 - /* 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 */ + /* In some cases, support for multibus is limited to some machine + * types */ if (qemuDomainIsARMVirt(def) || qemuDomainIsRISCVVirt(def)) { return true; --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org