From nobody Mon Sep 8 17:08:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1755621894; cv=none; d=zohomail.com; s=zohoarc; b=k30skRsbyD3PV0E/49ajdTTdNaXrITWOuSJZefVGSSrASsshuVwmE6fyPntxAH/lAujeuonuq4fGbFH1WldTBli6V0rCQoZtgwgJwtr8uHbpMFR6ok14qwevmyzmoxe9Khy/hK9rKV4Qc76OyJ4uMwqpIFb6GU/EeOTvr8CGTZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755621894; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=GA0Qpc6iAbIvDXP3i3X7XjBR4JLYH3rWDsLrTDLN88c=; b=bHBBE400EJ9UalmulR+9D+8ibFXWT6irpFU++IR+hHBoA2+WVtSKKKjxo7iY0iZPzWpZhzcT5nV6O4tmndcA2rXQEM9D+5zfRfC88FDtte2CTPk5y37WOueY41nUjsHBboyfG1HQoocQJB6BduE0f6hf+BURqoFZRQwdngcJRRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1755621894105172.47317832818703; Tue, 19 Aug 2025 09:44:54 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 182D0DCF; Tue, 19 Aug 2025 12:44:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id ED0DF110F; Tue, 19 Aug 2025 12:24:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CE77DD65; Tue, 19 Aug 2025 12:24:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 EDE81D61 for ; Tue, 19 Aug 2025 12:23:05 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-385-MMwTOosXN8uP6yJ2N2fxrg-1; Tue, 19 Aug 2025 12:23:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 433C519560A6 for ; Tue, 19 Aug 2025 16:23:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.253]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6B9FE18004A3 for ; Tue, 19 Aug 2025 16:23: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=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755620585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rTxB2oWXqdRvMj8rgbZXlempxNkcRbk/HwVoaS1Mldg=; b=Dvhd1NyYfkGb4sjW9uOEO8F6OaMG0qxd7xkxf+Jp2afEItpLYPW8Ex678GuJBbwj/V1CQ0 M6YgvxeknV2OcOR3yJgp9uy+lzUjrE/WASAGqEDPNcTZBOa7yIZC+5wDL7f9V5jmGZBFjB KfDanIWof3bGRPm80bGKUi4rK1N6r8o= X-MC-Unique: MMwTOosXN8uP6yJ2N2fxrg-1 X-Mimecast-MFC-AGG-ID: MMwTOosXN8uP6yJ2N2fxrg_1755620583 To: devel@lists.libvirt.org Subject: [PATCH 17/31] qemu: Update qemuDomainSupportsPCI() Date: Tue, 19 Aug 2025 18:22:21 +0200 Message-ID: <20250819162235.468215-18-abologna@redhat.com> In-Reply-To: <20250819162235.468215-1-abologna@redhat.com> References: <20250819162235.468215-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9x1-A1wcbBre4L9ZvwMewBBn6EKyHXzhh4rS6NQI1-Y_1755620583 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: G3PGEX6VVLBMONWZVD7PBR3PH4PBCGJQ X-Message-ID-Hash: G3PGEX6VVLBMONWZVD7PBR3PH4PBCGJQ 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: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1755621895398116600 Content-Type: text/plain; charset="utf-8"; x-default="true" The sparc architecture doesn't support PCI, and neither does the isapc machine type. One of the isapc tests starts failing as a consequence of this change, which is expected; somewhat surprisingly, another test for the same machine type goes from an early/hard failure (PARSE_ERROR) to a late/soft one (FAILURE) instead. This will be rectified by a later commit. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_domain.c | 10 ++++++ .../isapc-pci.x86_64-latest.args | 31 ------------------- .../isapc-pci.x86_64-latest.err | 1 + ...ontroller-default-isapc.x86_64-latest.xml} | 5 +-- tests/qemuxmlconftest.c | 4 +-- 5 files changed, 16 insertions(+), 35 deletions(-) delete mode 100644 tests/qemuxmlconfdata/isapc-pci.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/isapc-pci.x86_64-latest.err rename tests/qemuxmlconfdata/{isapc-pci.x86_64-latest.xml =3D> usb-control= ler-default-isapc.x86_64-latest.xml} (86%) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 81a8ca906d..186e36da03 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7703,6 +7703,16 @@ qemuDomainSupportsPCI(const virDomainDef *def) return false; } =20 + if (ARCH_IS_X86(def->os.arch)) { + if (STREQ(def->os.machine, "isapc")) { + return false; + } + return true; + } + + if (def->os.arch =3D=3D VIR_ARCH_SPARC) + return false; + /* On all other architectures, PCI support is assumed to * be present */ return true; diff --git a/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.args b/tests/qem= uxmlconfdata/isapc-pci.x86_64-latest.args deleted file mode 100644 index 789b7de0ed..0000000000 --- a/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dtest,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine isapc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acp= i=3Doff \ --accel tcg \ --cpu 486 \ --m size=3D2097152k \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}= ' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot strict=3Don \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.err b/tests/qemu= xmlconfdata/isapc-pci.x86_64-latest.err new file mode 100644 index 0000000000..0a45494ea2 --- /dev/null +++ b/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.err @@ -0,0 +1 @@ +unsupported configuration: Machine type 'isapc' does not support PCI diff --git a/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.xml b/tests/qemu= xmlconfdata/usb-controller-default-isapc.x86_64-latest.xml similarity index 86% rename from tests/qemuxmlconfdata/isapc-pci.x86_64-latest.xml rename to tests/qemuxmlconfdata/usb-controller-default-isapc.x86_64-latest.= xml index a32f3243d5..c18e2b1b0d 100644 --- a/tests/qemuxmlconfdata/isapc-pci.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-isapc.x86_64-latest.xml @@ -1,5 +1,5 @@ - test + q35-test 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 2097152 2097152 @@ -17,9 +17,10 @@ destroy /usr/bin/qemu-system-x86_64 - + diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index b3e1e37abb..9653dcc7df 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1295,7 +1295,7 @@ mymain(void) =20 DO_TEST_CAPS_LATEST_PARSE_ERROR("no-memory"); =20 - DO_TEST_CAPS_LATEST("isapc-pci"); + DO_TEST_CAPS_LATEST_PARSE_ERROR("isapc-pci"); =20 DO_TEST_CAPS_LATEST("genid"); DO_TEST_CAPS_LATEST("genid-auto"); @@ -1971,7 +1971,7 @@ mymain(void) ARG_QEMU_CAPS_DEL, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_= NEC_USB_XHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_LAST, ARG_END); =20 - DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-default-isapc"); + DO_TEST_CAPS_LATEST_FAILURE("usb-controller-default-isapc"); DO_TEST_CAPS_LATEST("usb-controller-default-i440fx"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); DO_TEST_CAPS_ARCH_LATEST("usb-controller-default-pseries", "ppc64"); --=20 2.50.1