From nobody Sat Feb 7 06:54:57 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 1709053940295546.2707710930674; Tue, 27 Feb 2024 09:12:20 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3EC441EAC; Tue, 27 Feb 2024 12:12:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 058131B91; Tue, 27 Feb 2024 11:40:26 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4952D1AD0; Tue, 27 Feb 2024 11:40:15 -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 B2F8D1B91 for ; Tue, 27 Feb 2024 11:36:43 -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-696-0Az4zZhFM9aQ7LUX3oRWdA-1; Tue, 27 Feb 2024 11:36:41 -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 547FB381200D for ; Tue, 27 Feb 2024 16:36:41 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id C227A1C060B1 for ; Tue, 27 Feb 2024 16:36:40 +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_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 0Az4zZhFM9aQ7LUX3oRWdA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 12/25] qemuDomainControllerDefPostParse: Use 'pci-ohci' as last-resort fallback USB controller Date: Tue, 27 Feb 2024 17:36:14 +0100 Message-ID: <7caff854b8c008ba7406eb21387161eba026a61e.1709051442.git.pkrempa@redhat.com> 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: HV47CU7EFC7HM5QRRMMZSDFCRPK44EI7 X-Message-ID-Hash: HV47CU7EFC7HM5QRRMMZSDFCRPK44EI7 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: 1709053941309100001 This controller is used as the default/implicit USB controller by multiple machine types which honour the '-usb' flag of qemu. Add it as fallback in libvirt too. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 7 ++++++- ...-default-fallback-versatilepb-armv7l.armv7l-latest.args | 2 +- ...r-default-fallback-versatilepb-armv7l.armv7l-latest.xml | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 23ba9521ec..d3a8446e46 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5650,9 +5650,14 @@ qemuDomainControllerDefPostParse(virDomainController= Def *cont, * * See qemuBuildControllersCommandLine() */ - /* Default USB controller is piix3-uhci if available. */ + /* Default USB controller is piix3-uhci if available. Fall bac= k to + * 'pci-ohci' otherwise which is the default for non-x86 machi= nes + * which honour -usb */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) cont->model =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; + else if (!ARCH_IS_X86(def->os.arch) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) + cont->model =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; if (ARCH_IS_S390(def->os.arch)) { if (cont->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_= NONE) { diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatil= epb-armv7l.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-defaul= t-fallback-versatilepb-armv7l.armv7l-latest.args index d7bad74061..a05a413290 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-arm= v7l.armv7l-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-arm= v7l.armv7l-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatil= epb-armv7l.armv7l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default= -fallback-versatilepb-armv7l.armv7l-latest.xml index ebea79c6d0..d934c3e842 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-arm= v7l.armv7l-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb-arm= v7l.armv7l-latest.xml @@ -18,7 +18,7 @@ /usr/bin/qemu-system-armv7l - +