From nobody Mon Sep 8 16:51:57 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=1755621355; cv=none; d=zohomail.com; s=zohoarc; b=jf7EjFOjbbOfTtqdNxEA5Y07sSremG8BYWqNsPH6laT/nfVrc//BShAkpeiDF1O+u/lXQ2dvGGEbu5Igq9Ai+Ljf7K87SxXcx75hfXHfG+tyX7d39+5vlnUewQftt+5dYPgNmYL6hq9kvQeuvkJEOD2+y9ujeJoUvHKTctQLibM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755621355; 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=bJY19fGF53t4pZEbnqI6nJPqcEYRmeiYD4kKPaXk4nI=; b=KyKZr45qxf1EGkM96eC10dWKk3OmViNn9xp5LhnNkquSlhQshDrfnwIjRJQOQtaa3vhS1lqViibvu274qJvjo8WqKdjzSVgxNSqZXthZ2JtS/hv3sKwZ+J1kmVEJoJkQiteJMSQ+6wBfgVPk0HBFNfNRn9CNl/e2iz+eKEn3Yyo= 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 1755621355214441.5917795014958; Tue, 19 Aug 2025 09:35:55 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9F0491240; Tue, 19 Aug 2025 12:35:54 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 64C7F110D; Tue, 19 Aug 2025 12:23:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5FD0CC33; Tue, 19 Aug 2025 12:23:13 -0400 (EDT) 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 426A7B7F for ; Tue, 19 Aug 2025 12:22:55 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-rYg3dAibPrGPlI8IavoKXw-1; Tue, 19 Aug 2025 12:22:53 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 820CB180035B for ; Tue, 19 Aug 2025 16:22:52 +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 AC41F180044F for ; Tue, 19 Aug 2025 16:22:51 +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=1755620574; 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=yLbMPayxUFDHxvkGwQCt2KNqP2FRJKbGRdq3Lsmgy0w=; b=da23CTzvAk/Xnu6eV6x9DnBY8Kct1E4C7h+C6R3fnwN42mqKtMJkH3K+Che9sLW9fdIj75 lmzxxKAnkGJJO14+W1wYGIJUomigvLj3NgSzLZSDR9Cx36StHa71wUKWRBzSlH52VXvFGE OXs/cLdmXYW/xQl3SG705DiB38ROPs8= X-MC-Unique: rYg3dAibPrGPlI8IavoKXw-1 X-Mimecast-MFC-AGG-ID: rYg3dAibPrGPlI8IavoKXw_1755620572 To: devel@lists.libvirt.org Subject: [PATCH 09/31] qemu: Check for pci-ohci availability Date: Tue, 19 Aug 2025 18:22:13 +0200 Message-ID: <20250819162235.468215-10-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: eHkA_CskTt19tXAOHImKGnSqaSU-QJI7c4WCwTU8Q10_1755620572 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z3WIA3IC5NNCWT4V74PLOZGC7NCSJJSE X-Message-ID-Hash: Z3WIA3IC5NNCWT4V74PLOZGC7NCSJJSE 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: 1755621356191124100 Content-Type: text/plain; charset="utf-8"; x-default="true" We assign the USB controller model without first checking whether the corresponding QEMU device is available, and that results in a late error instead of an early one. Be consistent with how we do things in all other cases and check the presence of the capability before attempting to set the model. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_postparse.c | 3 ++- ...ontroller-automatic-unavailable-realview.aarch64-latest.err | 2 +- ...ontroller-automatic-unavailable-realview.aarch64-latest.xml | 2 +- ...troller-automatic-unavailable-versatilepb.armv7l-latest.err | 2 +- ...troller-automatic-unavailable-versatilepb.armv7l-latest.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c index 9c2427970d..5f59b79d56 100644 --- a/src/qemu/qemu_postparse.c +++ b/src/qemu/qemu_postparse.c @@ -1299,7 +1299,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, if (STREQ(def->os.machine, "versatilepb") || STRPREFIX(def->os.machine, "realview")) { addDefaultUSB =3D true; - usbModel =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) + usbModel =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; } =20 if (qemuDomainIsARMVirt(def)) diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-rea= lview.aarch64-latest.err b/tests/qemuxmlconfdata/usb-controller-automatic-u= navailable-realview.aarch64-latest.err index 918b72dbe9..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.a= arch64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.a= arch64-latest.err @@ -1 +1 @@ -unsupported configuration: USB controller model 'pci-ohci' not supported i= n this QEMU binary +internal error: Unable to determine model for USB controller idx=3D0 diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-rea= lview.aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic-u= navailable-realview.aarch64-latest.xml index 372d5bda6a..dfa8ef8dbe 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.a= arch64-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-realview.a= arch64-latest.xml @@ -15,7 +15,7 @@ destroy /usr/bin/qemu-system-aarch64 - + diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-ver= satilepb.armv7l-latest.err b/tests/qemuxmlconfdata/usb-controller-automatic= -unavailable-versatilepb.armv7l-latest.err index 918b72dbe9..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-versatilep= b.armv7l-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-versatilep= b.armv7l-latest.err @@ -1 +1 @@ -unsupported configuration: USB controller model 'pci-ohci' not supported i= n this QEMU binary +internal error: Unable to determine model for USB controller idx=3D0 diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-ver= satilepb.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-automatic= -unavailable-versatilepb.armv7l-latest.xml index 482029e3b0..93bf8dcd0a 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-versatilep= b.armv7l-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-versatilep= b.armv7l-latest.xml @@ -17,7 +17,7 @@ destroy /usr/bin/qemu-system-armv7l - +
--=20 2.50.1