From nobody Mon Feb 9 00:02:46 2026 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 1709055823076539.905802062616; Tue, 27 Feb 2024 09:43:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id EFFFC1941; Tue, 27 Feb 2024 12:43:41 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 45E121DDB; Tue, 27 Feb 2024 11:42:13 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 962D91C33; Tue, 27 Feb 2024 11:41:57 -0500 (EST) 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 A031A1DAF for ; Tue, 27 Feb 2024 11:36:52 -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-617-zTYNCLVTOe22v-VsUeO7iQ-1; Tue, 27 Feb 2024 11:36:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 8AF353C0008A for ; Tue, 27 Feb 2024 16:36:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0F381C060B1 for ; Tue, 27 Feb 2024 16:36:49 +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_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: zTYNCLVTOe22v-VsUeO7iQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 22/25] qemu: command: Don't downgrade to '-usb' with 'pseries' machines Date: Tue, 27 Feb 2024 17:36:24 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: EXW4YAV22M6RAJB74ODWUJUDK23VOPZH X-Message-ID-Hash: EXW4YAV22M6RAJB74ODWUJUDK23VOPZH X-MailFrom: pkrempa@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" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1709055824392100001 The default USB device auto-selection code for 'pseries' machines picks controller models which are also selected when '-usb' is used thus it's impossible to end up in the case when using '-usb' would be possible: $ qemu-system-ppc64 --machine pseries,usb=3Don qemu-system-ppc64: could not find a module for type 'nec-usb-xhci' $ qemu-system-ppc64 --machine pseries-2.5,usb=3Don qemu-system-ppc64: could not find a module for type 'pci-ohci' Remove the impossible downgrade and adjust tests. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 1 + ...ault-unavailable-pseries.ppc64-latest.args | 33 ------------------- ...fault-unavailable-pseries.ppc64-latest.err | 1 + tests/qemuxmlconftest.c | 2 ++ 4 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-pseries.ppc64-latest.args create mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-pseries.ppc64-latest.err diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6328af70b..19eabb49ca 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2924,6 +2924,7 @@ qemuBuildDomainForbidLegacyUSBController(const virDom= ainDef *def) { if (ARCH_IS_X86(def->os.arch) || qemuDomainIsARMVirt(def) || + qemuDomainIsPSeries(def) || qemuDomainIsRISCVVirt(def)) return true; diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseri= es.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavail= able-pseries.ppc64-latest.args deleted file mode 100644 index 4d5825032d..0000000000 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc6= 4-latest.args +++ /dev/null @@ -1,33 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ --accel tcg \ --cpu POWER9 \ --m size=3D262144k \ --object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --usb \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseri= es.ppc64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavaila= ble-pseries.ppc64-latest.err new file mode 100644 index 0000000000..7a71aa107d --- /dev/null +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc6= 4-latest.err @@ -0,0 +1 @@ +unsupported configuration: no model provided for USB controller diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 417b5e5900..bb898a0787 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1891,9 +1891,11 @@ mymain(void) ARG_QEMU_CAPS_DEL, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_= NEC_USB_XHCI, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_LAST, ARG_END); + /* The USB controllers can be compiled out but downgrade to -usb fails= in qemu */ DO_TEST_FULL("usb-controller-default-unavailable-pseries", ".ppc64-lat= est", ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest", + ARG_FLAGS, FLAG_EXPECT_FAILURE, ARG_QEMU_CAPS_DEL, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_PCI_= OHCI, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_LAST, ARG_END); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org