From nobody Sun Oct 5 01:51:52 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=1758828236; cv=none; d=zohomail.com; s=zohoarc; b=UjLl3OiZ7SxKiVnxgxGTyOLVEXfjxQiugqKiRikv3r8+NudPWQ+lG70e1pdRozP7FRo/8LUErtDy2pciFX1dp2Hjg9Jig7CqX1hkfg/c2P+sCMsoEa2fHGQ0GkUvKBVr3vD11Iiwl+5Zx28y+6IzEFfGYQ9C+WIWG0N5+96/S84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758828236; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner: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=AbWJID+Vy4B2Yl6c6b8ht8MrDb+oKuc2siKs1VbmW5k=; b=ZmHwsTk79WdXwHdSDUg0GXGtaz3MV/Dyg4YvRL3MUOOgEMG6ZV5gxgnnZyvulOUC2n6xk6YVr62wz+Y3yrvjfM6pqP3zHgO/HQy05y4Mz1b4TRJJ64nFOUgBeFWHlsGf3ZFwB/ImXMOCAKWIj4Qr4B/NSR8b9JW+GJXbqpMiXOc= 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 1758828236669700.7772114301353; Thu, 25 Sep 2025 12:23:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BC6C63F89D; Thu, 25 Sep 2025 15:23:55 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 4AAF844D7B; Thu, 25 Sep 2025 14:30:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2B1B64400E; Thu, 25 Sep 2025 14:24:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E9F85441DE for ; Thu, 25 Sep 2025 14:08:19 -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-133-xzORFe4qPiaBdK8IA8dtzw-1; Thu, 25 Sep 2025 14:08:15 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 5EAFE19774D9 for ; Thu, 25 Sep 2025 18:08:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.225.196]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C30E30002D1 for ; Thu, 25 Sep 2025 18:08:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758823699; 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=AbWJID+Vy4B2Yl6c6b8ht8MrDb+oKuc2siKs1VbmW5k=; b=R7j2mbKL1oHsusHXxh+Z0R2p6w3YgQ7L9fbHddxfcHwwYpnVa4W8buPyDRuFjNPN2Gj9m3 h3NmabKd7m593DVh/05wyuRU/5V0mMwTJ3KLrOdq+M/uuRSXGor7Bi9EZKXt3R7idxM//G nBPYS9XEhfdoB4USfcOHIqupJcpE3zU= X-MC-Unique: xzORFe4qPiaBdK8IA8dtzw-1 X-Mimecast-MFC-AGG-ID: xzORFe4qPiaBdK8IA8dtzw_1758823694 To: devel@lists.libvirt.org Subject: [PATCH v2 34/38] qemu: Unify USB controllers across Arm architectures Date: Thu, 25 Sep 2025 20:07:20 +0200 Message-ID: <20250925180724.500758-35-abologna@redhat.com> In-Reply-To: <20250925180724.500758-1-abologna@redhat.com> References: <20250925180724.500758-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NjmjozMa2nTnZz0rTogqgbqLRUsvoFHv9fuzmynwXjg_1758823694 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VVTDQOAQ7UJWANHVSL6TMUUOBEH4JWQJ X-Message-ID-Hash: VVTDQOAQ7UJWANHVSL6TMUUOBEH4JWQJ X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1758828238335116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Currently we differentiate between 64-bit and 32-bit architectures, which doesn't seem very reasonable considering that the same machine types are available in both cases. Remove this inconsistency. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 2 +- .../usb-controller-default-versatilepb.armv7l-latest.args | 2 +- .../usb-controller-default-versatilepb.armv7l-latest.xml | 2 +- tests/qemuxmlconftest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 47ecf56efa..118470fef8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4331,7 +4331,7 @@ qemuDomainDefaultUSBControllerModel(const virDomainDe= f *def, return VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT; } =20 - if (def->os.arch =3D=3D VIR_ARCH_AARCH64) { + if (ARCH_IS_ARM(def->os.arch)) { /* Prefer qemu-xhci or nec-xhci (USB3) */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) return VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7= l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.ar= mv7l-latest.args index 8636c54dfe..88fe2b62e8 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.args +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.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 \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci","addr":"0x1"}' \ +-device '{"driver":"qemu-xhci","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-versatilepb.armv7= l-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.arm= v7l-latest.xml index e1a607c256..8a12dda0f7 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.xml @@ -17,7 +17,7 @@ destroy /usr/bin/qemu-system-armv7l - +
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 7b80e0c528..abe5609889 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2179,7 +2179,7 @@ mymain(void) DO_TEST_FULL("usb-controller-default-fallback-versatilepb", ".armv7l-l= atest", ARG_CAPS_ARCH, "armv7l", ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LA= ST, + ARG_QEMU_CAPS_DEL, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_= NEC_USB_XHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST, ARG_END); DO_TEST_FULL("usb-controller-default-unavailable-versatilepb", ".armv7= l-latest", ARG_CAPS_ARCH, "armv7l", --=20 2.51.0