From nobody Sun Oct 5 01: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=1758827936; cv=none; d=zohomail.com; s=zohoarc; b=LUW7JxszK8gnUHpIiUCdWg00mKeR3bi72Bn7RQ6Ov/GB2xPa0bhCq1AekmYX4i0AC7801AMLPq1Qx6PKKbQXC239O9PxZx/YRq14ILbrBwBixN6yj2doxcAn0pEVCjjW70XtD4TOKmcxK8GYzAOnbEOE+nT7pb6qL/bixSHGVc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758827936; 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=q1x2AmgKl40kvZThIbqgoD3uMRdPb4u7WNRmlQbEX7I=; b=SCQGxKKROljnQ0qmeMA0uCH6hQ7noNKUKyNPjC631/k3h5sMudE5dE7PfnOo//lC0eS51/zKv1UUvmD3aqZ29Yn0SZ+Q4VvzPru0wH4WlHSlcnW9pl6Yg321SAXPfsmje8hnXA9NRkExbEIJRge6W/IH3MD8iA56KvshEevJbIc= 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 1758827936372466.748935102132; Thu, 25 Sep 2025 12:18:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 65E0444277; Thu, 25 Sep 2025 15:18:55 -0400 (EDT) Received: from [172.19.199.14] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 405EF44D00; Thu, 25 Sep 2025 14:22:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 472B444C78; Thu, 25 Sep 2025 14:22:02 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 C5F05440C9 for ; Thu, 25 Sep 2025 14:08:15 -0400 (EDT) Received: from mx-prod-mc-06.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-142-YK8R-FGOMlm7X3asq2JV-g-1; Thu, 25 Sep 2025 14:08:14 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 102A5180057A for ; Thu, 25 Sep 2025 18:08:13 +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 3D41D300021A for ; Thu, 25 Sep 2025 18:08:11 +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=1758823695; 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=q1x2AmgKl40kvZThIbqgoD3uMRdPb4u7WNRmlQbEX7I=; b=GgpIsAH9DFloEQUrjsH20mf/QqJUs8NfRrKRjLUT5SdzKeX6Yh4uc529iEGSlj3ksiZ3Wf M2hhjwN6zJZGa9FqWVoCaW/q7iJCXMtxTB6g3n1iybxeb7tmSG1BVawTurBhJd7NjcGo1V Oz9XrKn7J3LaLquS004JXnas6JkqsrA= X-MC-Unique: YK8R-FGOMlm7X3asq2JV-g-1 X-Mimecast-MFC-AGG-ID: YK8R-FGOMlm7X3asq2JV-g_1758823693 To: devel@lists.libvirt.org Subject: [PATCH v2 33/38] qemu: Use qemu-xhci with no fallback on RISC-V Date: Thu, 25 Sep 2025 20:07:19 +0200 Message-ID: <20250925180724.500758-34-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: zeoOhYD9w0uy3A5f-a6WeI0ADpN7pxZtJ23-l0Gw3c8_1758823693 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SZEFANGOZUS7N4ZFMRM7VF5ZJUJMTYVL X-Message-ID-Hash: SZEFANGOZUS7N4ZFMRM7VF5ZJUJMTYVL 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: 1758827939037116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Similar to loongarch64, the current behavior is a result of the way the existing code was written rather than a consequence of an intentional choice. Make the two architectures behave the same way, as they should have from the start. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 3 +- ...ault-models.riscv64-latest.abi-update.args | 15 ++++--- ...fault-models.riscv64-latest.abi-update.xml | 26 +++++------- ...64-virt-default-models.riscv64-latest.args | 15 ++++--- ...v64-virt-default-models.riscv64-latest.xml | 26 +++++------- ...-fallback-virt-riscv64.riscv64-latest.args | 35 ---------------- ...t-fallback-virt-riscv64.riscv64-latest.xml | 41 ------------------- ...ntroller-default-fallback-virt-riscv64.xml | 1 - ...r-default-virt-riscv64.riscv64-latest.args | 5 +-- ...er-default-virt-riscv64.riscv64-latest.xml | 12 ++---- tests/qemuxmlconftest.c | 5 --- 11 files changed, 44 insertions(+), 140 deletions(-) delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-v= irt-riscv64.riscv64-latest.args delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-v= irt-riscv64.riscv64-latest.xml delete mode 120000 tests/qemuxmlconfdata/usb-controller-default-fallback-v= irt-riscv64.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 39a54b8009..47ecf56efa 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4322,7 +4322,8 @@ qemuDomainDefaultUSBControllerModel(const virDomainDe= f *def, { bool abiUpdate =3D !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); =20 - if (ARCH_IS_LOONGARCH(def->os.arch)) { + if (ARCH_IS_LOONGARCH(def->os.arch) || + qemuDomainIsRISCVVirt(def)) { /* Use qemu-xhci (USB3) with no fallback */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI)) return VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI; diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late= st.abi-update.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.risc= v64-latest.abi-update.args index 00ecc83126..99e1946d98 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.args +++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.args @@ -28,20 +28,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest= /.config \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-pci-bridge","id":"pci.3","bus":"pci.1","addr":"0x= 0"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.3","addr":"0x1"}= ' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.4","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.3","addr":"0x= 0"}' \ -netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -device '{"driver":"tpm-tis-device","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.5= ","addr":"0x0"}' \ +-device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pci.4= ","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late= st.abi-update.xml b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv= 64-latest.abi-update.xml index 4543364c89..620da73422 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.xml +++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.xml @@ -17,11 +17,11 @@ destroy /usr/bin/qemu-system-riscv64 - -
+ +
-
+
@@ -34,29 +34,25 @@
- - -
- - + - +
- + - +
- + - +
-
+
@@ -72,7 +68,7 @@