From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528622; cv=none;
	d=zohomail.com; s=zohoarc;
	b=GTjaZ1wlyLHQ+IHd4j7CuaAxY0k+m6Hy+8sJHo5CmOw/g7WO3I4knRe2CVjVuz6AbZe18BY6kurYbBGgliznF06B1+cN4V1IRrjrcFT61Ak7/SZIij7LTc4mLiTX7WgXxR2fy7oCObqMgUpQB65RSyzXFvmbR7k4OaZ3vvxs9kU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528622;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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;
	bh=8/sIrwtxhOMMwzfj9RcE1QmbyDMHm06hf3W9E7RYcnU=;
	b=n33OQV0PaPbljdOWhvCq6iK3jKeVs7Ta0l80Gi5JmNPsp5zoDNSS88q87kPoJxo3EJr0b0NTbLlJN0h62ik0vVqMh0vXX8O2qTFP0pqR7y+FV9Zu9KHVx8HLo191sN3B2ITy0NeqEnGUkqpy8egzBOHsEuYTkj+m1Y/Pkm/If0M=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1755528622641903.8352011319648;
 Mon, 18 Aug 2025 07:50:22 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id F21BA9F5; Mon, 18 Aug 2025 10:50:21 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 6ED44E39;
	Mon, 18 Aug 2025 10:40:39 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id A39E0B45; Mon, 18 Aug 2025 10:40:36 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.19])
	(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 97155D5B
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:43 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N2V4P-1uQG4x1ERr-011r0k; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527980; x=1756132780;
	i=maximilian_martin@gmx.de;
	bh=8/sIrwtxhOMMwzfj9RcE1QmbyDMHm06hf3W9E7RYcnU=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Type:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=prF+ofBVVYtTUv4JVQnWlVTHy1KcgulbAmApKONBnKDty+zMBsjon2+FFMNWd8/f
	 HJ8YUU69xuxOfO4c9aLqOvSN1wOwHDjLBz1uXlI5bM6kXCrwJ/YbcuLkLfMrrvnzs
	 YFBakROTRB/qpbB00iSEX4reapVqrZsa/YrcNUVEA3iIxqrklQVAFqsMtbrF+7Le8
	 MQLraH/xqdcSt1nFpwjrHvmluRHmns9rOPgzyRMeA4oxwt0DS5y+GwXko4BgU+ycp
	 7qurqTIzUB3bxtchengzsxbrNugV5gp+GZo4ULWuvejh1rbM8hHglvWp78EKGnJl3
	 yGfYyqA8/FWJ+7c3CA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 1/7] tests: validate an XML config with USB vendor/product
 set
Date: Mon, 18 Aug 2025 16:34:11 +0200
Message-Id: <20250818143417.765-2-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Ani7DRsXlOO3Hd2pJJeGGfGrSga1fdhjeAFAVPXMB1Qpdkuk0Ch
 M6i7XxifHLcjH/MfcozIxylgEFsYHluUtI77qDpNefPX6NCtAUjz8W7baqJbqaiTmVlxWyn
 N95aQ2EeJeF1pcw9MwAJMbzk27cePlxUxbG4OHD9ZSdU9nd8yqcgrzDgZABtbCTbqcwODLT
 1Rlv9A4EoV0QIU8eGXdqQ==
UI-OutboundReport: notjunk:1;M01:P0:z5kQYgCmGBg=;Yzq6IriiwiFnuU8bvShcvtfZDdW
 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
Message-ID-Hash: Y6CTYE3ZYSPA6PZA3TXYFJVNULKCAE6O
X-Message-ID-Hash: Y6CTYE3ZYSPA6PZA3TXYFJVNULKCAE6O
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/Y6CTYE3ZYSPA6PZA3TXYFJVNULKCAE6O/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528626327124100
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

The USB vendor/product is usually translated into a device/bus at
startup using the hostdev logic. We don't run the latter in the
unit test suite, but we can fake it by hardcoding a translation.
This demonstrates that we format the command line with the normal
device/bus properties, even when vendor/product is set.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 ...tdev-usb-vendor-product.x86_64-latest.args | 35 +++++++++++++++
 ...stdev-usb-vendor-product.x86_64-latest.xml | 44 +++++++++++++++++++
 .../hostdev-usb-vendor-product.xml            | 36 +++++++++++++++
 tests/qemuxmlconftest.c                       | 18 ++++++++
 4 files changed, 133 insertions(+)
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64=
-latest.args
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64=
-latest.xml
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-vendor-product.xml

diff --git a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest=
.args b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
new file mode 100644
index 0000000000..62338db872
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
@@ -0,0 +1,35 @@
+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-x86_64 \
+-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 pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","read-only":false}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor=
age","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/042/4660","id":"h=
ostdev0","guest-reset":true,"guest-resets-all":false,"bus":"usb.0","port":"=
1"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest=
.xml b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.xml
new file mode 100644
index 0000000000..340df80263
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source guestReset=3D'uninitialized'>
+        <vendor id=3D'0x1234'/>
+        <product id=3D'0x4321'/>
+      </source>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.xml b/tests/q=
emuxmlconfdata/hostdev-usb-vendor-product.xml
new file mode 100644
index 0000000000..dfb668f208
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source guestReset=3D'uninitialized'>
+        <vendor id=3D'0x1234'/>
+        <product id=3D'0x4321'/>
+      </source>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 079f20ddf4..56ace476af 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -474,6 +474,23 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
         }
     }
=20
+    for (i =3D 0; i < vm->def->nhostdevs; i++) {
+        virDomainHostdevDef *hostdev =3D vm->def->hostdevs[i];
+
+        if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
+            hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_T=
YPE_USB) {
+            virDomainHostdevSubsysUSB *usb =3D &hostdev->source.subsys.u.u=
sb;
+            if (!usb->device && !usb->bus) {
+                if (usb->vendor =3D=3D 0x1234 && usb->product =3D=3D 0x432=
1) {
+                    usb->bus =3D 42;
+                    usb->device =3D 0x1234;
+                } else {
+                    g_assert_not_reached();
+                }
+            }
+        }
+    }
+
     if (flags & FLAG_SLIRP_HELPER) {
         for (i =3D 0; i < vm->def->nnets; i++) {
             virDomainNetDef *net =3D vm->def->nets[i];
@@ -2143,6 +2160,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("hostdev-usb-address-device");
     DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-usb-duplicate");
+    DO_TEST_CAPS_LATEST("hostdev-usb-vendor-product");
     DO_TEST_CAPS_LATEST("hostdev-pci-address");
     DO_TEST_CAPS_LATEST("hostdev-pci-address-device");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-pci-duplicate");
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528244; cv=none;
	d=zohomail.com; s=zohoarc;
	b=GANaj2KrIhf8GFciVkYMfD55uXmXr05IxtNpEZHaxsebVF+CZsR2C7owy/EnUlFIpE9hmy0XJOM79UnGwHQK8WVd1uvSa8ZvOEnFbeCRAU1utnyV8JjxqkXcl6NxaUD5JmSlvrTf+yNqso01W7sv3LGgG1bmbeR8wmXUFCAfp/M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528244;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=WJVSUdVzHN0OXUaiFzahP2GvKxvBaXI0fKw9+KzwFVM=;
	b=TrEwo3T5ltl6/S2L9ASkFT60SGv+Q0HNc/OPCQYVKYxulgzRWjuRGSaIehu2t4MF85U7hu7tiB4D8B11ndVgrQHB74ZJbrheG+wEcmFNyBowq4lmAzg/AOxRRWlC8q5052vkQu/uB5EIJ7nJYbIEOO0No5lkOTDlejY0z5qEbfM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1755528244800839.2765693597726;
 Mon, 18 Aug 2025 07:44:04 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id BFC65D66; Mon, 18 Aug 2025 10:44:03 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 3191FB30;
	Mon, 18 Aug 2025 10:39:41 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 9B332D0E; Mon, 18 Aug 2025 10:39:36 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.19])
	(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 081CBA99
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:31 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1My36T-1udTVL1gLf-00xP2o; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527970; x=1756132770;
	i=maximilian_martin@gmx.de;
	bh=WJVSUdVzHN0OXUaiFzahP2GvKxvBaXI0fKw9+KzwFVM=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=A9txXQo6Eoh3G2ql7MeJZZ4ZObiO7bfbY8esH5YM3EAJgZggFt35Cul9QY2qzXDC
	 7P/Ife1lVf31K/Yt9zheYFBm5HBusxgJ2ZX2v5y3QUgADScJ2ZTqnDYpUi5fG1C1j
	 JaBtbiga6e5sgdEmmT/db1iR3SbAq82uTVjC/4cYZ2EonwjqEUXHGoPUbtmHCEGiP
	 ldES7p5zz4ItYO5hIx73sD8s5SQQa3jXtOsrY9N6Hz+GrEG1se3tCq79QbufCKXWi
	 tV/O+QnokQ05UrR8mxXrp1JcVAqpyahq7LQiJC4vouGjmj10DRzMfb0qFV8XoEcwd
	 781o3SfVxRUNsEcPiA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 2/7] virusb test data: add devpath files for port
 addressing
Date: Mon, 18 Aug 2025 16:34:12 +0200
Message-Id: <20250818143417.765-3-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:p+cMZWy0vIgmeI/37SRXIifAlvndoIRAdQS5bYFAGBqJ/wASXGy
 iK41+iKqb89BB23aPOh0nYMJ+keaGb/8QvD2S27U9tNfw3kFECyZEmweZuANXplymUXR+YS
 jlO0z5R9q0oVXZiVCP3VmATDy9cFASyYDt97a3/BC6agXdV44wTYHbuaxe4vazDtvAp/QWg
 bsXdF1J49qQRO3T7+kjzg==
UI-OutboundReport: notjunk:1;M01:P0:CHGmbltNTTA=;IbqQZuMFAD4gy2+DDHsgYiTEGx8
 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
 Sus9gHxv0gJcB9eQ=
Message-ID-Hash: 32WZTUVLAGQDTPWYSUSX4UMINGV5STCT
X-Message-ID-Hash: 32WZTUVLAGQDTPWYSUSX4UMINGV5STCT
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/32WZTUVLAGQDTPWYSUSX4UMINGV5STCT/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528245472116600
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

This patch adds devpath files to the virusb test data.
These files are mockups for the USB sysfs files that
contain the port of a USB device in dotted notation.
They are used for testing of USB bus/port matching.

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath   | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath   | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath   | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath   | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath     | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath     | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath       | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath     | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath       | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath      | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath      | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath      | 1 +
 tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath      | 1 +
 15 files changed, 15 insertions(+)
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devp=
ath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devp=
ath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath
 create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath

diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath b/t=
ests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath
new file mode 100644
index 0000000000..02a7fbef02
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devpath
@@ -0,0 +1 @@
+1.5.3.1
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath b/t=
ests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath
new file mode 100644
index 0000000000..23ca863cd4
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devpath
@@ -0,0 +1 @@
+1.5.3.3
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath b/tes=
ts/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath
new file mode 100644
index 0000000000..8af85beb51
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devpath
@@ -0,0 +1 @@
+1.5.3
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath b/tes=
ts/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath
new file mode 100644
index 0000000000..94fe62c274
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devpath
@@ -0,0 +1 @@
+1.5.4
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath b/tes=
ts/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath
new file mode 100644
index 0000000000..9075be4951
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devpath
@@ -0,0 +1 @@
+1.5.5
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath b/tes=
ts/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath
new file mode 100644
index 0000000000..eac1e0ada6
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devpath
@@ -0,0 +1 @@
+1.5.6
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath b/tests=
/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath
new file mode 100644
index 0000000000..c239c60cba
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devpath
@@ -0,0 +1 @@
+1.5
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath b/tests=
/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath
new file mode 100644
index 0000000000..810ee4e91e
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devpath
@@ -0,0 +1 @@
+1.6
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath b/tests/v=
irusbtestdata/sys_bus_usb/devices/1-1/devpath
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/1-1/devpath
@@ -0,0 +1 @@
+1
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath b/tests=
/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath
new file mode 100644
index 0000000000..5625e59da8
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devpath
@@ -0,0 +1 @@
+1.2
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath b/tests/v=
irusbtestdata/sys_bus_usb/devices/2-1/devpath
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/2-1/devpath
@@ -0,0 +1 @@
+1
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath b/tests/=
virusbtestdata/sys_bus_usb/devices/usb1/devpath
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/usb1/devpath
@@ -0,0 +1 @@
+0
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath b/tests/=
virusbtestdata/sys_bus_usb/devices/usb2/devpath
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/usb2/devpath
@@ -0,0 +1 @@
+0
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath b/tests/=
virusbtestdata/sys_bus_usb/devices/usb3/devpath
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/usb3/devpath
@@ -0,0 +1 @@
+0
diff --git a/tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath b/tests/=
virusbtestdata/sys_bus_usb/devices/usb4/devpath
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virusbtestdata/sys_bus_usb/devices/usb4/devpath
@@ -0,0 +1 @@
+0
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528566; cv=none;
	d=zohomail.com; s=zohoarc;
	b=CeOfqL0dUdN+BK/pRb04+97qSgQBr3lSFoV3prG1zyhpKy0kRtYb8DmVqLzjIsRvTGSHMc3/yBd1r38EIqzNJkY2VyGOJXTw5YOwGvjktdBzyJW29cobB2gHx46RBF7+UEI4N8SzasQG55v0hVfjevQunpou08jKuR3S182v8NQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528566;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=ClAbh02p/6jD1/1KKM2h9IFPnxesblMTD4rSYwemYAU=;
	b=LBbZynuYWLRU2uI4vewMlcoP08FHyg9FNV91cM6vNgZjfLk+yS2Wdj7vXKlRHKx42qVi0O4yZqGUXzYbDHleO/K4VRfpwLSLNRh8imLkDcsdsNcI0uLOLnSZkojNERxXlvEskrS7G9ZeXvAHokWcCX8++UF1vRcZHGWcoQA15Vg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1755528566508854.5592475880126;
 Mon, 18 Aug 2025 07:49:26 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id A90D2E02; Mon, 18 Aug 2025 10:49:25 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 02EDBD65;
	Mon, 18 Aug 2025 10:39:45 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 64792A99; Mon, 18 Aug 2025 10:39:37 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.15])
	(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 36C80A64
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:33 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N95iH-1uSRwZ27C3-0142s6; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527971; x=1756132771;
	i=maximilian_martin@gmx.de;
	bh=ClAbh02p/6jD1/1KKM2h9IFPnxesblMTD4rSYwemYAU=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=YIx55fXlvSC4ikpw1XhRw2IvASocgqIrA6DMUzMhi1LfUIhrHYEFo7+RkXY6kKS7
	 qVi0X3jr4aSvNkTIDLi4s2iibRAC+YEhsJHjLgVq1YdwXxlSSzvvAvtTV53kGs7Sy
	 Q/BDJentHTRzeBZbJDX4qE6UTzaw7azhk2v/wucwtjGOcn4RGpC9a5zrWhYpyDXSh
	 74k1rTOvCON77lZx+uoCljYRqG7iYDNomKuBfyesJXmzGr6vS/Alsw3eLlFkJKLpM
	 ma0eHgPHXCHxKAUTNUt29VgurehAbKWIVo+LAxXQCB8lo0Td3V8XIGo7yBny/FoHJ
	 /cTwGWbOWdZUWKXVWA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 3/7] domain_conf, virhostdev, virusb,
 virusb test: add bus/port matching
Date: Mon, 18 Aug 2025 16:34:13 +0200
Message-Id: <20250818143417.765-4-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:Ic4IM+b3J8m5DZgc+to6MTwwFQ4XVzRbnCXxkH1WWiwo9JkgP2T
 iMI6Iu6T/aFpPhrFSIJTjeXEFbWW4VBTJi0+rC6zXrC+9hyO4Cl49R+YiVxAyDAbL0CcHWY
 WeP+XxPDqXRv+LJTR5Uf1jrV5g9JEytEhBfpgfAHyvwLDVqWrRVbe+WTAF8OvE3C1VVo9cx
 kld23g9c33SddcJjfNzww==
UI-OutboundReport: notjunk:1;M01:P0:WZz1grYex1Y=;9OtijlTi+oCIVN5BbdVwW0JYX//
 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
 qkpOjAAaPCgMjy9qBfwwuL8Pj+az
Message-ID-Hash: AW54G4BPEH2UHW55O37MOYIAQ37NHMJQ
X-Message-ID-Hash: AW54G4BPEH2UHW55O37MOYIAQ37NHMJQ
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/AW54G4BPEH2UHW55O37MOYIAQ37NHMJQ/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528569360124100
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

This patch implements USB bus/port matching. In addition
to vendor/product and bus/device matching, bus/port
matching is implemented. This involves additions and
refactorings in the domain configuration, host device
handling, and USB helpers. Also, test methods are
refactored and extended.

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 src/conf/domain_conf.c      |  58 +++++++++++--
 src/conf/domain_conf.h      |   1 +
 src/hypervisor/virhostdev.c | 131 +++++++++++++++++------------
 src/libvirt_private.syms    |   2 -
 src/util/virusb.c           | 160 ++++++++++++------------------------
 src/util/virusb.h           |  22 ++---
 tests/virusbtest.c          | 149 +++++++++++++++++++++++----------
 7 files changed, 298 insertions(+), 225 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7766e302ec..63f3032892 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2680,6 +2680,15 @@ virDomainHostdevSubsysSCSIClear(virDomainHostdevSubs=
ysSCSI *scsisrc)
     }
 }
=20
+static void
+virDomainHostdevSubsysUSBClear(virDomainHostdevSubsysUSB *usbsrc)
+{
+    if (!usbsrc)
+        return;
+
+    VIR_FREE(usbsrc->port);
+}
+
=20
 static void
 virDomainHostdevDefClear(virDomainHostdevDef *def)
@@ -2723,6 +2732,8 @@ virDomainHostdevDefClear(virDomainHostdevDef *def)
             g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitma=
pFree);
             break;
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+            virDomainHostdevSubsysUSBClear(&def->source.subsys.u.usb);
+            break;
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
             break;
@@ -5961,13 +5972,38 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod=
e,
     }
=20
     if ((addressNode =3D virXPathNode("./address", ctxt))) {
+        bool foundDevice =3D false;
+        bool foundPort =3D false;
+        g_autofree char *port =3D NULL;
+        int rc =3D -1;
+
         if (virXMLPropUInt(addressNode, "bus", 0,
-                           VIR_XML_PROP_REQUIRED, &usbsrc->bus) < 0)
+                           VIR_XML_PROP_REQUIRED, &usbsrc->bus) < 0) {
             return -1;
+        }
=20
-        if (virXMLPropUInt(addressNode, "device", 0,
-                           VIR_XML_PROP_REQUIRED, &usbsrc->device) < 0)
+        rc =3D virXMLPropUInt(addressNode, "device", 0,
+                            VIR_XML_PROP_NONE, &usbsrc->device);
+        if (rc < 0)
             return -1;
+        else if (rc > 0)
+            foundDevice =3D true;
+
+        port =3D virXMLPropString(addressNode, "port");
+        if (port && *port) {
+            usbsrc->port =3D g_steal_pointer(&port);
+            foundPort =3D true;
+        }
+
+        if (!foundDevice && !foundPort) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                "%s", _("usb address needs either device id or port"));
+            return -1;
+        } else if (foundDevice && foundPort) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                "%s", _("found both device id and port in usb address (amb=
iguous setting)"));
+            return -1;
+        }
     }
=20
     return 0;
@@ -14851,8 +14887,13 @@ virDomainHostdevMatchSubsysUSB(virDomainHostdevDef=
 *first,
     virDomainHostdevSubsysUSB *first_usbsrc =3D &first->source.subsys.u.us=
b;
     virDomainHostdevSubsysUSB *second_usbsrc =3D &second->source.subsys.u.=
usb;
=20
-    if (first_usbsrc->bus && first_usbsrc->device) {
-        /* specified by bus location on host */
+    if (first_usbsrc->bus && first_usbsrc->port) {
+        /* specified by bus and port on host */
+        if (first_usbsrc->bus =3D=3D second_usbsrc->bus &&
+            STREQ_NULLABLE(first_usbsrc->port, second_usbsrc->port))
+            return 1;
+    } else if (first_usbsrc->bus && first_usbsrc->device) {
+        /* specified by bus and device id on host */
         if (first_usbsrc->bus =3D=3D second_usbsrc->bus &&
             first_usbsrc->device =3D=3D second_usbsrc->device)
             return 1;
@@ -24511,10 +24552,15 @@ virDomainHostdevDefFormatSubsysUSB(virBuffer *buf,
         virBufferAsprintf(&sourceChildBuf, "<product id=3D'0x%.4x'/>\n", u=
sbsrc->product);
     }
=20
-    if (usbsrc->bus || usbsrc->device)
+    if (usbsrc->bus && usbsrc->port) {
+        virBufferAsprintf(&sourceChildBuf, "<address %sbus=3D'%d' port=3D'=
%s'/>\n",
+                          includeTypeInAddr ? "type=3D'usb' " : "",
+                          usbsrc->bus, usbsrc->port);
+    } else if (usbsrc->bus || usbsrc->device) {
         virBufferAsprintf(&sourceChildBuf, "<address %sbus=3D'%d' device=
=3D'%d'/>\n",
                           includeTypeInAddr ? "type=3D'usb' " : "",
                           usbsrc->bus, usbsrc->device);
+    }
=20
     virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf);
 }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index eca820892e..a655dc57a8 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -228,6 +228,7 @@ struct _virDomainHostdevSubsysUSB {
                          on vendor/product */
     unsigned bus;
     unsigned device;
+    char *port;
=20
     unsigned vendor;
     unsigned product;
diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index 7d7df4418d..19907c76ba 100644
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -1359,6 +1359,41 @@ virHostdevMarkUSBDevices(virHostdevManager *mgr,
     return -1;
 }
=20
+static int
+virHostdevFindUSBDeviceWithFlags(virDomainHostdevDef *hostdev,
+                                 bool mandatory,
+                                 unsigned int flags,
+                                 virUSBDevice **usb)
+{
+    virDomainHostdevSubsysUSB *usbsrc =3D &hostdev->source.subsys.u.usb;
+    unsigned vendor =3D usbsrc->vendor;
+    unsigned product =3D usbsrc->product;
+    unsigned bus =3D usbsrc->bus;
+    const char *port =3D usbsrc->port;
+    unsigned device =3D usbsrc->device;
+    g_autoptr(virUSBDeviceList) devs =3D NULL;
+    int rc;
+
+    rc =3D virUSBDeviceFind(vendor, product, bus, device, port, NULL,
+                          mandatory, flags, &devs);
+    if (rc < 0)
+        return -1;
+
+    if (rc =3D=3D 1) {
+        *usb =3D virUSBDeviceListGet(devs, 0);
+        virUSBDeviceListSteal(devs, *usb);
+    }
+
+    if (rc > 1) {
+        virReportError(VIR_ERR_OPERATION_FAILED,
+                       _("Multiple USB devices for %1$x:%2$x, use <address=
> to specify one"),
+                       vendor, product);
+        return -1;
+    }
+
+    return rc;
+}
+
=20
 int
 virHostdevFindUSBDevice(virDomainHostdevDef *hostdev,
@@ -1367,77 +1402,65 @@ virHostdevFindUSBDevice(virDomainHostdevDef *hostde=
v,
 {
     virDomainHostdevSubsysUSB *usbsrc =3D &hostdev->source.subsys.u.usb;
     unsigned vendor =3D usbsrc->vendor;
-    unsigned product =3D usbsrc->product;
     unsigned bus =3D usbsrc->bus;
     unsigned device =3D usbsrc->device;
+    const char *port =3D usbsrc->port;
     bool autoAddress =3D usbsrc->autoAddress;
+    unsigned int flags =3D 0;
     int rc;
=20
     *usb =3D NULL;
=20
-    if (vendor && bus) {
-        rc =3D virUSBDeviceFind(vendor, product, bus, device,
-                              NULL,
-                              autoAddress ? false : mandatory,
-                              usb);
-        if (rc < 0) {
-            return -1;
-        } else if (!autoAddress) {
-            goto out;
-        } else {
-            VIR_INFO("USB device %x:%x could not be found at previous"
-                     " address (bus:%u device:%u)",
-                     vendor, product, bus, device);
-        }
+    if (vendor)
+        flags |=3D USB_DEVICE_FIND_BY_VENDOR;
+    if (device)
+        flags |=3D USB_DEVICE_FIND_BY_DEVICE;
+    if (port)
+        flags |=3D USB_DEVICE_FIND_BY_PORT;
+
+    /* Rule out invalid cases. */
+    if (vendor && device && port) {
+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("Cannot match USB device on vendor/product, bus/d=
evice, and bus/port at once."));
+    } else if (device && port) {
+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("Cannot match USB device on bus/device and bus/po=
rt at once."));
+    } else if (!vendor && !device && !port) {
+        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("No matching fields for USB device found. Vendor/=
product, bus/device, or bus/port required."));
+        return -1;
     }
=20
-    /* When vendor is specified, its USB address is either unspecified or =
the
-     * device could not be found at the USB device where it had been
-     * automatically found before.
-     */
-    if (vendor) {
-        g_autoptr(virUSBDeviceList) devs =3D NULL;
+    /* First attempt, matching on all valid fields. */
+    rc =3D virHostdevFindUSBDeviceWithFlags(hostdev,
+                                          autoAddress ? false : mandatory,
+                                          flags, usb);
+    if (rc < 0)
+        return -1;
=20
-        rc =3D virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, =
&devs);
-        if (rc < 0) {
-            return -1;
-        } else if (rc =3D=3D 0) {
-            goto out;
-        } else if (rc > 1) {
-            if (autoAddress) {
-                virReportError(VIR_ERR_OPERATION_FAILED,
-                               _("Multiple USB devices for %1$x:%2$x were =
found, but none of them is at bus:%3$u device:%4$u"),
-                               vendor, product, bus, device);
-            } else {
-                virReportError(VIR_ERR_OPERATION_FAILED,
-                               _("Multiple USB devices for %1$x:%2$x, use =
<address> to specify one"),
-                               vendor, product);
-            }
+    if (rc !=3D 1 && autoAddress && device) {
+        VIR_INFO("USB device could not be found at previous address "
+                 "(bus:%u device:%u)", bus, device);
+
+        /* Second attempt, for when the device number has changed. */
+        flags &=3D ~USB_DEVICE_FIND_BY_DEVICE;
+        usbsrc->device =3D 0;
+
+        rc =3D virHostdevFindUSBDeviceWithFlags(hostdev, mandatory,
+                                              flags, usb);
+        if (rc < 0)
             return -1;
-        }
=20
-        *usb =3D virUSBDeviceListGet(devs, 0);
-        virUSBDeviceListSteal(devs, *usb);
+        usbsrc->autoAddress =3D true;
+    }
=20
+    if (!*usb) {
+        hostdev->missing =3D true;
+    } else if (!usbsrc->bus || !usbsrc->device) {
         usbsrc->bus =3D virUSBDeviceGetBus(*usb);
         usbsrc->device =3D virUSBDeviceGetDevno(*usb);
-        usbsrc->autoAddress =3D true;
-
-        if (autoAddress) {
-            VIR_INFO("USB device %x:%x found at bus:%u device:%u (moved"
-                     " from bus:%u device:%u)",
-                     vendor, product,
-                     usbsrc->bus, usbsrc->device,
-                     bus, device);
-        }
-    } else if (bus) {
-        if (virUSBDeviceFindByBus(bus, device, NULL, mandatory, usb) < 0)
-            return -1;
     }
=20
- out:
-    if (!*usb)
-        hostdev->missing =3D true;
     return 0;
 }
=20
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b846011f0f..bc01f25d4c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3680,8 +3680,6 @@ virURIResolveAlias;
 # util/virusb.h
 virUSBDeviceFileIterate;
 virUSBDeviceFind;
-virUSBDeviceFindByBus;
-virUSBDeviceFindByVendor;
 virUSBDeviceFree;
 virUSBDeviceGetBus;
 virUSBDeviceGetDevno;
diff --git a/src/util/virusb.c b/src/util/virusb.c
index cf3461f80a..85ad3d58ce 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -61,12 +61,6 @@ struct _virUSBDeviceList {
     virUSBDevice **devs;
 };
=20
-typedef enum {
-    USB_DEVICE_ALL =3D 0,
-    USB_DEVICE_FIND_BY_VENDOR =3D 1 << 0,
-    USB_DEVICE_FIND_BY_BUS =3D 1 << 1,
-} virUSBDeviceFindFlags;
-
 static virClass *virUSBDeviceListClass;
=20
 static void virUSBDeviceListDispose(void *obj);
@@ -102,11 +96,29 @@ static int virUSBSysReadFile(const char *f_name, const=
 char *d_name,
     return 0;
 }
=20
+static int
+virUSBSysReadFileStr(const char *f_name,
+                     const char *d_name,
+                     char **value)
+{
+    char *buf =3D NULL;
+    g_autofree char *filename =3D NULL;
+
+    filename =3D g_strdup_printf(USB_SYSFS "/devices/%s/%s", d_name, f_nam=
e);
+
+    if (virFileReadAll(filename, 1024, &buf) < 0)
+        return -1;
+
+    *value =3D buf;
+    return 0;
+}
+
 static virUSBDeviceList *
 virUSBDeviceSearch(unsigned int vendor,
                    unsigned int product,
                    unsigned int bus,
                    unsigned int devno,
+                   const char *port,
                    const char *vroot,
                    unsigned int flags)
 {
@@ -127,6 +139,8 @@ virUSBDeviceSearch(unsigned int vendor,
=20
     while ((direrr =3D virDirRead(dir, &de, USB_SYSFS "/devices")) > 0) {
         unsigned int found_prod, found_vend, found_bus, found_devno;
+        g_autofree char *found_port =3D NULL;
+        bool port_matches;
         char *tmpstr =3D de->d_name;
=20
         if (strchr(de->d_name, ':'))
@@ -154,16 +168,31 @@ virUSBDeviceSearch(unsigned int vendor,
                               10, &found_devno) < 0)
             goto cleanup;
=20
-        if ((flags & USB_DEVICE_FIND_BY_VENDOR) &&
-            (found_prod !=3D product || found_vend !=3D vendor))
-            continue;
+        if (virUSBSysReadFileStr("devpath", de->d_name,
+                                 &found_port) < 0) {
+            goto cleanup;
+        } else {
+            virStringTrimOptionalNewline(found_port);
+            port_matches =3D STREQ_NULLABLE(found_port, port);
+        }
=20
-        if (flags & USB_DEVICE_FIND_BY_BUS) {
+        if (flags & USB_DEVICE_FIND_BY_VENDOR) {
+            if (found_prod !=3D product || found_vend !=3D vendor)
+                continue;
+        }
+
+        if (flags & USB_DEVICE_FIND_BY_DEVICE) {
             if (found_bus !=3D bus || found_devno !=3D devno)
                 continue;
             found =3D true;
         }
=20
+        if (flags & USB_DEVICE_FIND_BY_PORT) {
+            if (found_bus !=3D bus || !port_matches)
+                continue;
+            found =3D true;
+        }
+
         usb =3D virUSBDeviceNew(found_bus, found_devno, vroot);
=20
         if (!usb)
@@ -185,123 +214,42 @@ virUSBDeviceSearch(unsigned int vendor,
     return ret;
 }
=20
-int
-virUSBDeviceFindByVendor(unsigned int vendor,
-                         unsigned int product,
-                         const char *vroot,
-                         bool mandatory,
-                         virUSBDeviceList **devices)
-{
-    virUSBDeviceList *list;
-    int count;
-
-    if (!(list =3D virUSBDeviceSearch(vendor, product, 0, 0,
-                                    vroot,
-                                    USB_DEVICE_FIND_BY_VENDOR)))
-        return -1;
-
-    if (list->count =3D=3D 0) {
-        virObjectUnref(list);
-        if (!mandatory) {
-            VIR_DEBUG("Did not find USB device %04x:%04x",
-                      vendor, product);
-            if (devices)
-                *devices =3D NULL;
-            return 0;
-        }
-
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Did not find USB device %1$04x:%2$04x"), vendor,=
 product);
-        return -1;
-    }
-
-    count =3D list->count;
-    if (devices)
-        *devices =3D list;
-    else
-        virObjectUnref(list);
-
-    return count;
-}
-
-int
-virUSBDeviceFindByBus(unsigned int bus,
-                      unsigned int devno,
-                      const char *vroot,
-                      bool mandatory,
-                      virUSBDevice **usb)
-{
-    virUSBDeviceList *list;
-
-    if (!(list =3D virUSBDeviceSearch(0, 0, bus, devno,
-                                    vroot,
-                                    USB_DEVICE_FIND_BY_BUS)))
-        return -1;
-
-    if (list->count =3D=3D 0) {
-        virObjectUnref(list);
-        if (!mandatory) {
-            VIR_DEBUG("Did not find USB device bus:%u device:%u",
-                      bus, devno);
-            if (usb)
-                *usb =3D NULL;
-            return 0;
-        }
-
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Did not find USB device bus:%1$u device:%2$u"),
-                       bus, devno);
-        return -1;
-    }
-
-    if (usb) {
-        *usb =3D virUSBDeviceListGet(list, 0);
-        virUSBDeviceListSteal(list, *usb);
-    }
-    virObjectUnref(list);
-
-    return 0;
-}
-
 int
 virUSBDeviceFind(unsigned int vendor,
                  unsigned int product,
                  unsigned int bus,
                  unsigned int devno,
+                 const char *port,
                  const char *vroot,
                  bool mandatory,
-                 virUSBDevice **usb)
+                 unsigned int flags,
+                 virUSBDeviceList **devices)
 {
-    virUSBDeviceList *list;
+    g_autoptr(virUSBDeviceList) list =3D NULL;
+    int count;
=20
-    unsigned int flags =3D USB_DEVICE_FIND_BY_VENDOR|USB_DEVICE_FIND_BY_BU=
S;
-    if (!(list =3D virUSBDeviceSearch(vendor, product, bus, devno,
+    if (!(list =3D virUSBDeviceSearch(vendor, product, bus, devno, port,
                                     vroot, flags)))
         return -1;
=20
-    if (list->count =3D=3D 0) {
-        virObjectUnref(list);
+    count =3D list->count;
+    if (count =3D=3D 0) {
         if (!mandatory) {
-            VIR_DEBUG("Did not find USB device %04x:%04x bus:%u device:%u",
-                      vendor, product, bus, devno);
-            if (usb)
-                *usb =3D NULL;
+            if (devices)
+                *devices =3D NULL;
             return 0;
         }
=20
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Did not find USB device %1$04x:%2$04x bus:%3$u d=
evice:%4$u"),
-                       vendor, product, bus, devno);
+                       _("Did not find matching USB device: vid:%1$04x, pi=
d:%2$04x, bus:%3$u, device:%4$u, port:%5$s"),
+                       vendor, product, bus, devno, port ? port : "");
         return -1;
     }
=20
-    if (usb) {
-        *usb =3D virUSBDeviceListGet(list, 0);
-        virUSBDeviceListSteal(list, *usb);
-    }
-    virObjectUnref(list);
+    if (devices)
+        *devices =3D g_steal_pointer(&list);
=20
-    return 0;
+    return count;
 }
=20
 virUSBDevice *
diff --git a/src/util/virusb.h b/src/util/virusb.h
index d2b3f69942..86cc0a9d3d 100644
--- a/src/util/virusb.h
+++ b/src/util/virusb.h
@@ -30,30 +30,26 @@ typedef struct _virUSBDeviceList virUSBDeviceList;
=20
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virUSBDeviceList, virObjectUnref);
=20
+typedef enum {
+    USB_DEVICE_ALL =3D 0,
+    USB_DEVICE_FIND_BY_VENDOR =3D 1 << 0,
+    USB_DEVICE_FIND_BY_DEVICE =3D 1 << 1,
+    USB_DEVICE_FIND_BY_PORT =3D 1 << 2,
+} virUSBDeviceFindFlags;
=20
 virUSBDevice *virUSBDeviceNew(unsigned int bus,
                                 unsigned int devno,
                                 const char *vroot);
=20
-int virUSBDeviceFindByBus(unsigned int bus,
-                          unsigned int devno,
-                          const char *vroot,
-                          bool mandatory,
-                          virUSBDevice **usb);
-
-int virUSBDeviceFindByVendor(unsigned int vendor,
-                             unsigned int product,
-                             const char *vroot,
-                             bool mandatory,
-                             virUSBDeviceList **devices);
-
 int virUSBDeviceFind(unsigned int vendor,
                      unsigned int product,
                      unsigned int bus,
                      unsigned int devno,
+                     const char *port,
                      const char *vroot,
                      bool mandatory,
-                     virUSBDevice **usb);
+                     unsigned int flags,
+                     virUSBDeviceList **devices);
=20
 void virUSBDeviceFree(virUSBDevice *dev);
 int virUSBDeviceSetUsedBy(virUSBDevice *dev,
diff --git a/tests/virusbtest.c b/tests/virusbtest.c
index 870e136321..12ac338df9 100644
--- a/tests/virusbtest.c
+++ b/tests/virusbtest.c
@@ -26,9 +26,11 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
=20
 typedef enum {
-    FIND_BY_ALL,
     FIND_BY_VENDOR,
-    FIND_BY_BUS
+    FIND_BY_DEVICE,
+    FIND_BY_PORT,
+    FIND_BY_VENDOR_AND_DEVICE,
+    FIND_BY_VENDOR_AND_PORT
 } testUSBFindFlags;
=20
 struct findTestInfo {
@@ -37,6 +39,7 @@ struct findTestInfo {
     unsigned int product;
     unsigned int bus;
     unsigned int devno;
+    const char *port;
     const char *vroot;
     bool mandatory;
     int how;
@@ -70,25 +73,34 @@ static int testDeviceFind(const void *opaque)
     g_autoptr(virUSBDeviceList) devs =3D NULL;
     int rv =3D 0;
     size_t i, ndevs =3D 0;
+    unsigned int flags =3D 0;
=20
     switch (info->how) {
-    case FIND_BY_ALL:
-        rv =3D virUSBDeviceFind(info->vendor, info->product,
-                              info->bus, info->devno,
-                              info->vroot, info->mandatory, &dev);
-        break;
     case FIND_BY_VENDOR:
-        rv =3D virUSBDeviceFindByVendor(info->vendor, info->product,
-                                      info->vroot, info->mandatory, &devs);
+        flags =3D USB_DEVICE_FIND_BY_VENDOR;
+        break;
+    case FIND_BY_DEVICE:
+        flags =3D USB_DEVICE_FIND_BY_DEVICE;
+        break;
+    case FIND_BY_PORT:
+        flags =3D USB_DEVICE_FIND_BY_PORT;
         break;
-    case FIND_BY_BUS:
-        rv =3D virUSBDeviceFindByBus(info->bus, info->devno,
-                                   info->vroot, info->mandatory, &dev);
+    case FIND_BY_VENDOR_AND_DEVICE:
+        flags =3D USB_DEVICE_FIND_BY_VENDOR |
+                USB_DEVICE_FIND_BY_DEVICE;
+        break;
+    case FIND_BY_VENDOR_AND_PORT:
+        flags =3D USB_DEVICE_FIND_BY_VENDOR |
+                USB_DEVICE_FIND_BY_PORT;
         break;
     }
=20
+    rv =3D virUSBDeviceFind(info->vendor, info->product,
+                          info->bus, info->devno, info->port,
+                          info->vroot, info->mandatory, flags, &devs);
+
     if (info->expectFailure) {
-        if (rv =3D=3D 0) {
+        if (rv >=3D 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            "unexpected success");
         } else {
@@ -99,9 +111,20 @@ static int testDeviceFind(const void *opaque)
         goto cleanup;
     }
=20
+    if (info->how !=3D FIND_BY_VENDOR) {
+        if (rv =3D=3D 1) {
+            dev =3D virUSBDeviceListGet(devs, 0);
+            virUSBDeviceListSteal(devs, dev);
+        } else {
+            goto cleanup;
+        }
+    }
+
     switch (info->how) {
-    case FIND_BY_ALL:
-    case FIND_BY_BUS:
+    case FIND_BY_DEVICE:
+    case FIND_BY_PORT:
+    case FIND_BY_VENDOR_AND_DEVICE:
+    case FIND_BY_VENDOR_AND_PORT:
         if (virUSBDeviceFileIterate(dev, testDeviceFileActor, NULL) < 0)
             goto cleanup;
         break;
@@ -146,14 +169,17 @@ testUSBList(const void *opaque G_GNUC_UNUSED)
     virUSBDeviceList *list =3D NULL;
     virUSBDeviceList *devlist =3D NULL;
     virUSBDevice *dev =3D NULL;
+    virUSBDeviceList *devs =3D NULL;
     int ret =3D -1;
+    int rv;
     size_t i, ndevs;
=20
     if (!(list =3D virUSBDeviceListNew()))
         goto cleanup;
=20
 #define EXPECTED_NDEVS_ONE 3
-    if (virUSBDeviceFindByVendor(0x1d6b, 0x0002, NULL, true, &devlist) < 0)
+    if (virUSBDeviceFind(0x1d6b, 0x0002, 0, 0, NULL, NULL, true,
+                         USB_DEVICE_FIND_BY_VENDOR, &devlist) < 0)
         goto cleanup;
=20
     ndevs =3D virUSBDeviceListCount(devlist);
@@ -176,7 +202,8 @@ testUSBList(const void *opaque G_GNUC_UNUSED)
         goto cleanup;
=20
 #define EXPECTED_NDEVS_TWO 3
-    if (virUSBDeviceFindByVendor(0x18d1, 0x4e22, NULL, true, &devlist) < 0)
+    if (virUSBDeviceFind(0x18d1, 0x4e22, 0, 0, NULL, NULL, true,
+                         USB_DEVICE_FIND_BY_VENDOR, &devlist) < 0)
         goto cleanup;
=20
     ndevs =3D virUSBDeviceListCount(devlist);
@@ -196,8 +223,16 @@ testUSBList(const void *opaque G_GNUC_UNUSED)
                        EXPECTED_NDEVS_ONE + EXPECTED_NDEVS_TWO) < 0)
         goto cleanup;
=20
-    if (virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, NULL, true, &dev) < 0)
+    rv =3D virUSBDeviceFind(0x18d1, 0x4e22, 1, 20, NULL, NULL, true,
+                            USB_DEVICE_FIND_BY_VENDOR |
+                            USB_DEVICE_FIND_BY_DEVICE, &devs);
+    if (rv !=3D 1) {
         goto cleanup;
+    } else {
+        dev =3D virUSBDeviceListGet(devs, 0);
+        virUSBDeviceListSteal(devs, dev);
+    }
+    virObjectUnref(devs);
=20
     if (!virUSBDeviceListFind(list, dev)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -229,49 +264,75 @@ mymain(void)
 {
     int rv =3D 0;
=20
-#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, vroot, mand, how, =
fail) \
+#define DO_TEST_FIND_FULL(name, vend, prod, bus, devno, \
+                          port, vroot, mand, how, fail) \
     do { \
         struct findTestInfo data =3D { name, vend, prod, bus, \
-            devno, vroot, mand, how, fail \
+            devno, port, vroot, mand, how, fail \
         }; \
         if (virTestRun("USBDeviceFind " name, testDeviceFind, &data) < 0) \
             rv =3D -1; \
     } while (0)
=20
-#define DO_TEST_FIND(name, vend, prod, bus, devno) \
-    DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \
-                      FIND_BY_ALL, false)
-#define DO_TEST_FIND_FAIL(name, vend, prod, bus, devno) \
-    DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, true, \
-                      FIND_BY_ALL, true)
-
-#define DO_TEST_FIND_BY_BUS(name, bus, devno) \
-    DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \
-                      FIND_BY_BUS, false)
-#define DO_TEST_FIND_BY_BUS_FAIL(name, bus, devno) \
-    DO_TEST_FIND_FULL(name, 101, 202, bus, devno, NULL, true, \
-                      FIND_BY_BUS, true)
-
 #define DO_TEST_FIND_BY_VENDOR(name, vend, prod) \
-    DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \
+    DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, NULL, true, \
                       FIND_BY_VENDOR, false)
 #define DO_TEST_FIND_BY_VENDOR_FAIL(name, vend, prod) \
-    DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, true, \
+    DO_TEST_FIND_FULL(name, vend, prod, 123, 456, NULL, NULL, true, \
                       FIND_BY_VENDOR, true)
=20
-    DO_TEST_FIND("Nexus", 0x18d1, 0x4e22, 1, 20);
-    DO_TEST_FIND_FAIL("Nexus wrong devnum", 0x18d1, 0x4e22, 1, 25);
-    DO_TEST_FIND_FAIL("Bogus", 0xf00d, 0xbeef, 1024, 768);
-
-    DO_TEST_FIND_BY_BUS("integrated camera", 1, 5);
-    DO_TEST_FIND_BY_BUS_FAIL("wrong bus/devno combination", 2, 20);
-    DO_TEST_FIND_BY_BUS_FAIL("missing bus", 5, 20);
-    DO_TEST_FIND_BY_BUS_FAIL("missing devnum", 1, 158);
+#define DO_TEST_FIND_BY_DEVICE(name, bus, devno) \
+    DO_TEST_FIND_FULL(name, 0x1010, 0x2020, bus, devno, NULL, NULL, true, \
+                      FIND_BY_DEVICE, false)
+#define DO_TEST_FIND_BY_DEVICE_FAIL(name, bus, devno) \
+    DO_TEST_FIND_FULL(name, 0x1010, 0x2020, bus, devno, NULL, NULL, true, \
+                      FIND_BY_DEVICE, true)
+
+#define DO_TEST_FIND_BY_PORT(name, bus, port) \
+    DO_TEST_FIND_FULL(name, 0x1010, 0x2020, bus, 456, port, NULL, true, \
+                      FIND_BY_PORT, false)
+#define DO_TEST_FIND_BY_PORT_FAIL(name, bus, port) \
+    DO_TEST_FIND_FULL(name, 0x1010, 0x2020, bus, 456, port, NULL, true, \
+                      FIND_BY_PORT, true)
+
+#define DO_TEST_FIND_BY_VENDOR_AND_DEVICE(name, vend, prod, bus, devno) \
+    DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, NULL, true, \
+                      FIND_BY_VENDOR_AND_DEVICE, false)
+#define DO_TEST_FIND_BY_VENDOR_AND_DEVICE_FAIL(name, vend, prod, bus, devn=
o) \
+    DO_TEST_FIND_FULL(name, vend, prod, bus, devno, NULL, NULL, true, \
+                      FIND_BY_VENDOR_AND_DEVICE, true)
+
+#define DO_TEST_FIND_BY_VENDOR_AND_PORT(name, vend, prod, bus, port) \
+    DO_TEST_FIND_FULL(name, vend, prod, bus, 456, port, NULL, true, \
+                      FIND_BY_VENDOR_AND_PORT, false)
+#define DO_TEST_FIND_BY_VENDOR_AND_PORT_FAIL(name, vend, prod, bus, port) \
+    DO_TEST_FIND_FULL(name, vend, prod, bus, 456, port, NULL, true, \
+                      FIND_BY_VENDOR_AND_PORT, true)
+
+    DO_TEST_FIND_BY_DEVICE("integrated camera", 1, 5);
+    DO_TEST_FIND_BY_DEVICE_FAIL("wrong bus/devno combination", 2, 20);
+    DO_TEST_FIND_BY_DEVICE_FAIL("missing bus", 5, 20);
+    DO_TEST_FIND_BY_DEVICE_FAIL("missing devnum", 1, 158);
=20
     DO_TEST_FIND_BY_VENDOR("Nexus (multiple results)", 0x18d1, 0x4e22);
     DO_TEST_FIND_BY_VENDOR_FAIL("Bogus vendor and product", 0xf00d, 0xbeef=
);
     DO_TEST_FIND_BY_VENDOR_FAIL("Valid vendor", 0x1d6b, 0xbeef);
=20
+    DO_TEST_FIND_BY_PORT("Logitech mouse", 1, "1.5.3.3");
+    DO_TEST_FIND_BY_PORT_FAIL("wrong bus/port combination", 2, "1.5.3.3");
+    DO_TEST_FIND_BY_PORT_FAIL("missing bus", 5, "1.5.3.3");
+    DO_TEST_FIND_BY_PORT_FAIL("missing port", 1, "8.2.5");
+
+    DO_TEST_FIND_BY_VENDOR_AND_DEVICE("Nexus", 0x18d1, 0x4e22, 1, 20);
+    DO_TEST_FIND_BY_VENDOR_AND_DEVICE_FAIL("Bogus vendor and product", 0xf=
00d, 0xbeef, 1, 25);
+    DO_TEST_FIND_BY_VENDOR_AND_DEVICE_FAIL("Nexus wrong devnum", 0x18d1, 0=
x4e22, 1, 25);
+    DO_TEST_FIND_BY_VENDOR_AND_DEVICE_FAIL("Bogus", 0xf00d, 0xbeef, 1024, =
768);
+
+    DO_TEST_FIND_BY_VENDOR_AND_PORT("Nexus", 0x046d, 0xc069, 1, "1.5.3.3");
+    DO_TEST_FIND_BY_VENDOR_AND_PORT_FAIL("Bogus vendor and product", 0xf00=
d, 0xbeef, 1, "1.5.3.3");
+    DO_TEST_FIND_BY_VENDOR_AND_PORT_FAIL("Nexus wrong port", 0x18d1, 0x4e2=
2, 1, "8.2.5");
+    DO_TEST_FIND_BY_VENDOR_AND_PORT_FAIL("Bogus", 0xf00d, 0xbeef, 1024, "1=
.1.1.1");
+
     if (virTestRun("USB List test", testUSBList, NULL) < 0)
         rv =3D -1;
=20
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528102; cv=none;
	d=zohomail.com; s=zohoarc;
	b=SQpVCIKF29QB/CL3dNVW9Qpm3b2wVnX+ht4UnF528EMcFQsZfk2ZAWvalQ6sNCCJBqGVbBzf6XOyASP7AjHDldFmXoaAxh/VtyQoAsEMLdFYAkj3VZWcrR2OA2XO4EDyOpYBxi4ucVTNjWIKO+cKGn7oXgP0LUJRGXh9gXMLguE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528102;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=lIwBdvxwlpgrWNk/NgQua6pBp5VaHVc8ABVjyecptDc=;
	b=FvhLuelNEsHHm2XMvodpWyMca0sE5ykH3jRgf4bjPtEsb2u/uMvEVkaUyEcEF7YhvGQc7yCaKLvfh0mzbxjhxx5itWaEBCY80C9JPVCDOJ17t98IrpIaj50hVACCCBaELUT2C5T2Z/c+J81J46sH4KAZ1hHR64MZQY3OiJ6S5xY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 17555281029669.12784256156101;
 Mon, 18 Aug 2025 07:41:42 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 68DB9B8F; Mon, 18 Aug 2025 10:41:42 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id C3D95D0E;
	Mon, 18 Aug 2025 10:39:36 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id F38A8B03; Mon, 18 Aug 2025 10:39:33 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.15])
	(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 E731CA75
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:29 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MXp5a-1v4WeG2cnM-00Xzyb; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527968; x=1756132768;
	i=maximilian_martin@gmx.de;
	bh=lIwBdvxwlpgrWNk/NgQua6pBp5VaHVc8ABVjyecptDc=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=aoLeRcC5ONg6qtiEUORz5pyx0kbiquqLt8m3d3qNkx3ToC1esm9Tw/R/ymmeSih8
	 eUsLW5l0hN03u4V1Q1oFKv6tcd15kaj6wYa1DTUPaskrGF/KFB6+JS25tR7UYR76/
	 0B4J/qK43dPwI9EV+HPoptTt0Dl7PiCSx1qhQEwNyFgo9uzi2+XnORY0UmeqnsC1k
	 dxiTmUYoQsqUp1sfRqQMZNM8v4KNhcbMc/nqlbMqT2z2PVXUBlfC9zdN/9h7AwuXy
	 6XjxXMeV6oxcOtJm93YPtzAPQEoPHtfl6kNcapX+K6tC+HCLN0rzVY4F3yxg8GAtR
	 Mo2DUIBRpuDCF2rHFg==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 4/7] schema: add USB port attribute
Date: Mon, 18 Aug 2025 16:34:14 +0200
Message-Id: <20250818143417.765-5-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:LMs5LrcaGb0MToS6+8B+tedsKB7VbczY0FgpDPmoIs63rE3d5fU
 7IuSAJn/fzuU1sl2Ty0PnLs2soJI1+H6HSq+ZgPmFchWCIELmCnLtBZ0kQtlfo++8WSk5/x
 owdNC0DoSOTAncYE7Xfhpj1e2GNkFZWpu7CbpKGWGdXMUFnGSoMDv2RS1ctOqGR46iydmLJ
 mb6UIr/HQa+QCSCd/Nw1g==
UI-OutboundReport: notjunk:1;M01:P0:2gTJzHUMj2I=;dIKiZeQpliV8RB9OWtygQ9Lq44K
 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
Message-ID-Hash: 2SFWFMPUT35KXNFHAWXFS47EFH4V357S
X-Message-ID-Hash: 2SFWFMPUT35KXNFHAWXFS47EFH4V357S
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/2SFWFMPUT35KXNFHAWXFS47EFH4V357S/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528105621124100
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

Adds USB bus/port addressing the domain XML file
schema. Optionally, the physical USB port can be
declared instead of the USB device address.

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 src/conf/schemas/domaincommon.rng | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom=
mon.rng
index e369fb6e81..438bdc6ef6 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -6785,9 +6785,14 @@
       <attribute name=3D"bus">
         <ref name=3D"usbAddr"/>
       </attribute>
-      <attribute name=3D"device">
-        <ref name=3D"usbAddr"/>
-      </attribute>
+      <choice>
+        <attribute name=3D"device">
+          <ref name=3D"usbAddr"/>
+        </attribute>
+        <attribute name=3D"port">
+          <ref name=3D"usbPort"/>
+        </attribute>
+      </choice>
     </element>
   </define>
   <define name=3D"scsiaddress">
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528378; cv=none;
	d=zohomail.com; s=zohoarc;
	b=G6BtYt49HZ7IdG6ajYQxlpgnmpCziwAkTckv8rapx4Z4cMno8a0XUYi9arbFwBRn5Gl3MRwTHdxVDmXrEnXXNbFbSMe87UreAG37F8fDrAWHfb1Nyd/qOrQAy13lYCZAUDFoLbWAFiDUHRC186oEwSuvGzNHAFcZBUjdmWIXD3w=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528378;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=hL3N7vqNbNpAwuim14BlRWCBv1CCndZmXATEU4ZwB6Q=;
	b=LjU3tdrJHG3SQcz7hS6i8uG/k4KwZRZAXjpZzPWZmPFUCk15iomsh+X9GXrhmWqv5K//dHNXlsC6jnOLImsZKHKFGl9wylXN1pzIBvTDLX0r/OZ+tf7NPefDmsRJRcJz3N22BTG5ReOqQKYZ6HLPsM3lAX5lRWXKPTGgRsPsERM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1755528378114934.5040027256833;
 Mon, 18 Aug 2025 07:46:18 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 28E03C7E; Mon, 18 Aug 2025 10:46:17 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id BCDE6D58;
	Mon, 18 Aug 2025 10:39:42 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id A7AE0A99; Mon, 18 Aug 2025 10:39:36 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.19])
	(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 AB42BA95
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:31 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MDhlV-1ufScF32sZ-0094b4; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527969; x=1756132769;
	i=maximilian_martin@gmx.de;
	bh=hL3N7vqNbNpAwuim14BlRWCBv1CCndZmXATEU4ZwB6Q=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=A5bDDse3XvriV8i9jvtZdCDHx0qrcSMEHO7QVv5T5XvGgVa9PZ96Uc5oIxrZtT8v
	 5/Lc+M6QrAcyJvslKsBcULeEr9FvbTxFaU145DbE6tZu0WaMEiTwJp071CJ/CXUrN
	 vpBS/MlJVLzarhOFw80tpwjyoucG1ssmqhILJhW2adG51cz3VC6prZhHid55+nL9t
	 gbN0l39B6vdlUotEUW2EbIFuUnqtT7acc+OjqOT6yh+kSUPM1d5wRBdrqpbLxr6eB
	 Ea5mNyMMuSGwRkYaCS9RFgAFWsGJsRna5o/zMugGU8A8H0KZf4UQ5SrGBQXsMNLN2
	 mly37l2NnSr6oHpWcg==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 5/7] tests: validate an XML config with USB bus/port set
Date: Mon, 18 Aug 2025 16:34:15 +0200
Message-Id: <20250818143417.765-6-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:EShbNdRoOrF11RdKEmYFCi5V7vgllDOnnh7HNSERyA/yexm6MdJ
 V/T8hBx6ZvUgeVwkq4HZrhY4c728dUHQIp4Aeg4zU9xbVpAQaMXFqQED+22jcOhCl0ZoTem
 m8yAw8MwjHOmOSHFbxEk32XgKMpUg3X+f6PjE3roY6ixQ+Deyazz149RJhrSjCM6qvyydSr
 /W2989sX0NfXtUdaV/4Cw==
UI-OutboundReport: notjunk:1;M01:P0:zsXDYLaKOr8=;GglzAnldNlnoxNPx/2cOKBNPOt/
 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
 W+S2hugVnWv2syFbkwyEtanyBW1yCQ0WEaWW6
Message-ID-Hash: DNJMR7RIKXBV3HPQPBU5VSUMKWJE6EG7
X-Message-ID-Hash: DNJMR7RIKXBV3HPQPBU5VSUMKWJE6EG7
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/DNJMR7RIKXBV3HPQPBU5VSUMKWJE6EG7/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528380838116600
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

USB bus/port addressing is translated into a bus/device addressing
at startup using the hostdev logic. This test covers XML parsing
and CLI formatting for bus/port addressing.

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 ...ostdev-usb-address-port.x86_64-latest.args | 36 +++++++++++++++
 ...hostdev-usb-address-port.x86_64-latest.xml | 45 +++++++++++++++++++
 .../hostdev-usb-address-port.xml              | 28 ++++++++++++
 tests/qemuxmlconftest.c                       |  7 +++
 4 files changed, 116 insertions(+)
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-l=
atest.args
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxmlconfdata/hostdev-usb-address-port.xml

diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.a=
rgs b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
new file mode 100644
index 0000000000..8996f05223
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
@@ -0,0 +1,36 @@
+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-x86_64 \
+-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 pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
+-accel tcg \
+-cpu qemu64 \
+-m size=3D219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
+-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 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","read-only":false}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor=
age","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/002/004","id":"ho=
stdev0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
+-msg timestamp=3Don
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.x=
ml b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.xml
new file mode 100644
index 0000000000..7a280d9ecd
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'2' port=3D'3'/>
+      </source>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-port.xml b/tests/qem=
uxmlconfdata/hostdev-usb-address-port.xml
new file mode 100644
index 0000000000..199cf9c372
--- /dev/null
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.xml
@@ -0,0 +1,28 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+    </disk>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'2' port=3D'3'/>
+      </source>
+    </hostdev>
+    <memballoon model=3D'virtio'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 56ace476af..4111d21853 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -487,6 +487,12 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv,
                 } else {
                     g_assert_not_reached();
                 }
+            } else if (!usb->device && !usb->vendor && !usb->product) {
+                if (usb->bus =3D=3D 2 && STREQ(usb->port, "3")) {
+                    usb->device =3D 4;
+                } else {
+                    g_assert_not_reached();
+                }
             }
         }
     }
@@ -2161,6 +2167,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-usb-duplicate");
     DO_TEST_CAPS_LATEST("hostdev-usb-vendor-product");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address-port");
     DO_TEST_CAPS_LATEST("hostdev-pci-address");
     DO_TEST_CAPS_LATEST("hostdev-pci-address-device");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-pci-duplicate");
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528464; cv=none;
	d=zohomail.com; s=zohoarc;
	b=j+tkIBVrdQNUxg9i/MFEtSLx3mOxEuQ9A4VOdghVReY5mxgJ+ZT5CQoQA3NtbtuH1pOzRSwi25B38iKpw9mtXce29Wv87KWNf8xcNbUzw8UlGVR3Xkbue5VOkfQ2/oGbwzvPwruxqTkWzNlaAcuRg8ZpixYF6lyZetwkcR4ybSc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528464;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=thqzT3vCSPgZdr2HtmvOy/3bTYaoB2eb+nED1aL1Ii8=;
	b=Vn7EuvzTpIOefyH8yul4zXaXHijMAX63HcDmaFlii5Sw5Tx9WVTAp+QXeyUMc6vxwHCkjHo472LiXA6olfTlpJ8g16EuJRyUGmxqMIV0gzz8cHYTZqLAvaO0N8A1LrWYrUil7iMTEOgTWlWawKb0a6SNNL2A9O8p4EN/6dj2lfg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1755528464130370.5175170154389;
 Mon, 18 Aug 2025 07:47:44 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 1784896B; Mon, 18 Aug 2025 10:47:43 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 9580BD76;
	Mon, 18 Aug 2025 10:39:44 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id AB8DDAE2; Mon, 18 Aug 2025 10:39:36 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.15])
	(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 15DA9B01
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:31 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M7Jza-1uvgye3Syy-007dRB; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527970; x=1756132770;
	i=maximilian_martin@gmx.de;
	bh=thqzT3vCSPgZdr2HtmvOy/3bTYaoB2eb+nED1aL1Ii8=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=avKnAKtff3U7nOB/DlPoNPomfYq3kkW36S3w8Uks6G2ijw23qZlhEnfb4ZSX5Gb3
	 m8/ancIU/9sluZrYg+Icn64OHwYnIL+ru0sQtGt2FaPMexze0WI0L5x++fCeL8sky
	 9b4I/k1wtfwJUd1EFgjNCnEsjG4fHn0+EwrvcLxeApWNB/5pS1baG1fixPsrk8u8s
	 2FHdNiLmxn3w9feTAHohQ4+3Iw0MDBxn20ctDNxGG7d7Jm/kW7mFlwdy68r6VAKn2
	 HzKJOI3usRtr6tWIWPsZJ/sxx4gF6O3SUUkLpMx0WkodQgkwDeswWlHV7EkS69d6e
	 Nv3d/Vi0vjeGeQLHhA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 6/7] nodedev: add USB port to nodedev XML
Date: Mon, 18 Aug 2025 16:34:16 +0200
Message-Id: <20250818143417.765-7-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:aOfX51/EuZpD0HV4sjvZ3ubpmO3Xz73V53opoEDEJXwY3B7Cc4t
 hYjNJS8GD7uqeLGymNKq1jTqK/ilWHkS4OaMyTdbMzanz2zqqifFu0euizbGRtzLWf7IO2Z
 H+9i1t48uO4TytNXWct6lfgchDkWa8WP99fAoiPt25lWqfUKhDsfDdwZDoSfslxAV4VlfCT
 laaqyWUbnyeshFcHNOcsg==
UI-OutboundReport: notjunk:1;M01:P0:ohH27wCoL/A=;BDR/ckjS5TBR1XuTAKgjNn64Sri
 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
 5ODZUBloHgpw9+EEkHmnNZKWcmIB
Message-ID-Hash: TWCBODT4B63V2MOXLL6YUPHI7DFKM5JU
X-Message-ID-Hash: TWCBODT4B63V2MOXLL6YUPHI7DFKM5JU
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/TWCBODT4B63V2MOXLL6YUPHI7DFKM5JU/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528466153116600
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

This adds the physical USB port to the capabilities of a
USB device in nodedev XML.
example: <port>1.4</port>

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 src/conf/node_device_conf.c                   |  5 +++
 src/conf/node_device_conf.h                   |  1 +
 src/conf/schemas/basictypes.rng               | 31 +++++++++++++++++++
 src/conf/schemas/domaincommon.rng             | 30 ------------------
 src/conf/schemas/nodedev.rng                  |  3 ++
 src/node_device/node_device_udev.c            |  4 +++
 .../usb_device_1d6b_1_0000_00_1d_0.xml        |  1 +
 7 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 9c7982c680..ed0d340aa2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -432,6 +432,9 @@ virNodeDeviceCapUSBDevDefFormat(virBuffer *buf,
     virBufferAsprintf(buf, "<bus>%d</bus>\n", data->usb_dev.bus);
     virBufferAsprintf(buf, "<device>%d</device>\n",
                       data->usb_dev.device);
+    if (data->usb_dev.port)
+        virBufferEscapeString(buf, "<port>%s</port>\n",
+                              data->usb_dev.port);
     virBufferAsprintf(buf, "<product id=3D'0x%04x'",
                       data->usb_dev.product);
     if (data->usb_dev.product_name)
@@ -2083,6 +2086,7 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt,
                                     _("invalid USB product ID supplied for=
 '%1$s'")) < 0)
         return -1;
=20
+    usb_dev->port  =3D virXPathString("string(./port[1])", ctxt);
     usb_dev->vendor_name  =3D virXPathString("string(./vendor[1])", ctxt);
     usb_dev->product_name =3D virXPathString("string(./product[1])", ctxt);
=20
@@ -2802,6 +2806,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps)
     case VIR_NODE_DEV_CAP_USB_DEV:
         g_free(data->usb_dev.product_name);
         g_free(data->usb_dev.vendor_name);
+        g_free(data->usb_dev.port);
         break;
     case VIR_NODE_DEV_CAP_USB_INTERFACE:
         g_free(data->usb_if.description);
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index b98fb750ce..d6d2081278 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -211,6 +211,7 @@ typedef struct _virNodeDevCapUSBDev virNodeDevCapUSBDev;
 struct _virNodeDevCapUSBDev {
    unsigned int bus;
    unsigned int device;
+   char *port;
    unsigned int product;
    unsigned int vendor;
    char *product_name;
diff --git a/src/conf/schemas/basictypes.rng b/src/conf/schemas/basictypes.=
rng
index 2931e316b7..7d0361b413 100644
--- a/src/conf/schemas/basictypes.rng
+++ b/src/conf/schemas/basictypes.rng
@@ -378,6 +378,37 @@
     </choice>
   </define>
=20
+  <define name=3D"usbIdDefault">
+    <data type=3D"string">
+      <param name=3D"pattern">-1</param>
+    </data>
+  </define>
+  <define name=3D"usbId">
+    <data type=3D"string">
+      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,4}</param>
+    </data>
+  </define>
+  <define name=3D"usbVersion">
+    <data type=3D"string">
+      <param name=3D"pattern">[0-9]{1,2}.[0-9]{1,2}</param>
+    </data>
+  </define>
+  <define name=3D"usbAddr">
+    <data type=3D"string">
+      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,3}</param>
+    </data>
+  </define>
+  <define name=3D"usbClass">
+    <data type=3D"string">
+      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,2}</param>
+    </data>
+  </define>
+  <define name=3D"usbPort">
+    <data type=3D"string">
+      <param name=3D"pattern">((0x)?[0-9a-fA-F]{1,3}\.){0,3}(0x)?[0-9a-fA-=
F]{1,3}</param>
+    </data>
+  </define>
+
   <define name=3D"wwn">
     <data type=3D"string">
       <param name=3D"pattern">(0x)?[0-9a-fA-F]{16}</param>
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom=
mon.rng
index 438bdc6ef6..ee91bf7133 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -8686,36 +8686,6 @@
       <ref name=3D"dnsName"/>
     </choice>
   </define>
-  <define name=3D"usbIdDefault">
-    <data type=3D"string">
-      <param name=3D"pattern">-1</param>
-    </data>
-  </define>
-  <define name=3D"usbId">
-    <data type=3D"string">
-      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,4}</param>
-    </data>
-  </define>
-  <define name=3D"usbVersion">
-    <data type=3D"string">
-      <param name=3D"pattern">[0-9]{1,2}.[0-9]{1,2}</param>
-    </data>
-  </define>
-  <define name=3D"usbAddr">
-    <data type=3D"string">
-      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,3}</param>
-    </data>
-  </define>
-  <define name=3D"usbClass">
-    <data type=3D"string">
-      <param name=3D"pattern">(0x)?[0-9a-fA-F]{1,2}</param>
-    </data>
-  </define>
-  <define name=3D"usbPort">
-    <data type=3D"string">
-      <param name=3D"pattern">((0x)?[0-9a-fA-F]{1,3}\.){0,3}(0x)?[0-9a-fA-=
F]{1,3}</param>
-    </data>
-  </define>
   <define name=3D"driveController">
     <data type=3D"string">
       <param name=3D"pattern">[0-9]{1,2}</param>
diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng
index 31ce517e4d..3b5d1391c5 100644
--- a/src/conf/schemas/nodedev.rng
+++ b/src/conf/schemas/nodedev.rng
@@ -288,6 +288,9 @@
     <element name=3D"device">
       <ref name=3D"unsignedLong"/>
     </element>
+    <element name=3D"port">
+      <ref name=3D"unsignedLong"/>
+    </element>
=20
     <element name=3D"product">
       <attribute name=3D"id">
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi=
ce_udev.c
index 30c2ddf568..1f1f84c6ca 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -595,6 +595,10 @@ udevProcessUSBDevice(struct udev_device *device,
         return -1;
     if (udevGetUintProperty(device, "ID_VENDOR_ID", &usb_dev->vendor, 16) =
< 0)
         return -1;
+    if (!usb_dev->port) {
+        udevGetStringSysfsAttr(device, "devpath",
+                               &usb_dev->port);
+    }
=20
     udevGetStringProperty(device,
                           "ID_VENDOR_FROM_DATABASE",
diff --git a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml b/t=
ests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
index 29533e769b..0898213532 100644
--- a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
+++ b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
@@ -4,6 +4,7 @@
   <capability type=3D'usb_device'>
     <bus>2</bus>
     <device>1</device>
+    <port>3</port>
     <product id=3D'0x0001'>1.1 root hub</product>
     <vendor id=3D'0x1d6b'>Linux Foundation</vendor>
   </capability>
--=20
2.39.5
From nobody Sun Sep  7 23:51:54 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  header.i=maximilian_martin@gmx.de;
	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=1755528130; cv=none;
	d=zohomail.com; s=zohoarc;
	b=dJA1ujvgPdzcS9r2skP6N+Wuhu2f3r67jjLmpTXDwb7Ngf0sY3K5rgc5oMUZQB+Tl1iTdGY2FPoW+nTHUbuzk+v/8K74QM6Ah4XzXos5/s2TtOAmrlgYlDIotqixROXTp9PGicq2AC5fHyfHK1h31+wkfT55GZ3dYJD9T9Klz0c=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1755528130;
 h=Content-Transfer-Encoding:Cc:Cc: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;
	bh=bZ6myFujSz1kSMQoQJxPkacuQGqaOxo/T27t7fpoMkQ=;
	b=Es+lZqJw5Uc6ZBiTbHkqm360DhxgVAvVWC6auKePzwhaka29gZvaPWkyaN+SDJ8sKcFl9HuoTCg12ZfH4Qkr9oUhqp2vh4BtbteqAy4efPCCfETKtnPztFq5z16FvdRLyWcsZwyQAiyiLicFzZAnn1pElaENJKh19UpAKOQEpLc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail  header.i=maximilian_martin@gmx.de;
	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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 175552813045274.46400643450295;
 Mon, 18 Aug 2025 07:42:10 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 7093CAEB; Mon, 18 Aug 2025 10:42:09 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 8B127D3D;
	Mon, 18 Aug 2025 10:39:40 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 5B32AA79; Mon, 18 Aug 2025 10:39:36 -0400 (EDT)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.18])
	(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 730DDA79
	for <devel@lists.libvirt.org>; Mon, 18 Aug 2025 10:39:30 -0400 (EDT)
Received: from cu-host.fritz.box ([185.17.205.244]) by mail.gmx.net (mrgmx004
 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mi2Nv-1uJ3m93uqn-00fKE8; Mon, 18
 Aug 2025 16:34:20 +0200
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
	s=s31663417; t=1755527969; x=1756132769;
	i=maximilian_martin@gmx.de;
	bh=bZ6myFujSz1kSMQoQJxPkacuQGqaOxo/T27t7fpoMkQ=;
	h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:
	 References:MIME-Version:Content-Transfer-Encoding:cc:
	 content-transfer-encoding:content-type:date:from:message-id:
	 mime-version:reply-to:subject:to;
	b=AGFhD810/egZMaUG08ERX/mF9PI8vcHqTDil8+g4zDe/kDC3MaBECwRTq333g4UV
	 tF5iL0hgqNTkGlhMBtVGvPd+6wd6b0JyNv1Y0o3DZDWnBZlV/tY/tx5beLYf9dhEA
	 xVUoXdSZ6GUseUrJfRjheLZrffHceOi3FgafgzrrlW0kZSCGsWzzrRmKh6pW/WxY6
	 rsv7y8sl60wHt35iOBe1wrPBFweOxs0olhhJ9tVVnwjKGVtE+EUrZ8j5fide/q/8q
	 y5Had+QtJoKGHLDHN1C/Q+bylWoLCDfIdfLaFjDRVkGpfMJ/iVICsCRvWyniNZLmE
	 /keLYlRRB+Laf1F4Bw==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
To: devel@lists.libvirt.org
Subject: [PATCH v3 7/7] docs: add description for USB port matching
Date: Mon, 18 Aug 2025 16:34:17 +0200
Message-Id: <20250818143417.765-8-maximilian_martin@gmx.de>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250818143417.765-1-maximilian_martin@gmx.de>
References: <20250818143417.765-1-maximilian_martin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:HQ9yk6mA1nHpBJ6iToVgx40MfCS2SQze/AGKLy8j17cCRziriuz
 2iIOuMC6FF++dfYjNPm2Gj8ubZwmi3Iqng4sbdaQOJjwT42tO81BKHNVvtvyKdYBoNGPAJU
 8ETBmL1DCbTBLd7NZ1ataGspfqRe98kAZOROYxhugk3Wa9BQHMjxd+SWvtFGESHJOAYJom9
 dKXq9zUNFD2KMZZLObSQw==
UI-OutboundReport: notjunk:1;M01:P0:BGcaK+ovvhQ=;IE/U1wKlLgVNztSNnNf/hugqfON
 Ocx6KuH03nq+E7Wx4O/fRBt/zoXfjlaDWqY7LXgNpE2MXPShtFAtTJFySQAS3bmBRlFnyRlLH
 b5yvqwMcD3o/E73nOfOnNlTOJghjGV4e3ZHZ7jEhwy1wDTjAKV7odU7JthGQVyhkEAsWaz+XK
 mD/sDWk8O7h6XdVQOkEXirsT7/ZKxOhuZLrBQzWGhvvlnh1p4RV5kDiHup4HaRQI+wpbOWGpR
 L0Gp5BEG1J0MWOm5D0TdNPUKUNOMMh1AChanS2LNC19w2wD6RiteVaD8cHuoW/cuyrLgTUFhM
 h57Mhfvh55/JI7jHrEXpRnziE2/SJ7lt/jhMXwF8GyXyYHMSbBJLnhVlbnMuD58+Hbyo4APsU
 MXobo5oBW99w38WzCBoCGHhFGNfa+7lsrnzkNydoifK3qZPU3faUk85YwsAUHfqlJ+nw6Crjm
 HAMzBULfK3nPSJo4oHS48tVuCS44kXHPnhTFhZS6agXLk10R6hmtYftjLnRxXB1SafVdtlfGZ
 z5co2olQEOM7FmThYRb/4ZlDIZuGpW/rTEPQ8BdbQwjYdEQ59+yq3uLpQ1kbaI6hyoizXcN4L
 PnZ3pDYlWY7kXhhXuG/nB6/Oc/DMz/U79hFjUY7+c0IZ4sZfW+U40ZRpcGFqAN967rvDv/iJX
 rlSe/Sek6XGqPW5el8sE+qFJ6Ktbce15a9Ex21AFx2BOw78tTfrVnXBy91m1JwEfY2AuMg+7t
 im42R66YPeCzsTBdVsFbvVdB1+RxIkdFbUjrwS2wynzBLE8MAKSBnYl5Ls+I1E7i0W+9eerby
 p5r580IT7fDw+iHjzWunrJJLZPzWwutjQOmoBz2cZxxoS6+Uw6o+XAAJwwiMVQuBWJgx+kPz8
 5pLAK3UldrWIHFSC27EbmOBQAEqd2LPW2QRODBuvZYhyyNrzoOirLeKD45IU0rwyFT8ks//i9
 cyGAAhjxA2LQ3CpMPkzjGJoqXghQ7wpQ8nNfbMq225kVIB+OqfQpEmF5lK3OwaNXYSfqP/a6p
 WJMi4eQYgTEyJ7mIdsfY7eH76bhckmUX7BetZYP0x0ThKsHCAHVbLmpV4KG2hmVPHCUw8HedM
 U3Du7orFWZ3g6Mv78Naxw9bJmj5t4F2Ldp5L1Cm8y3Uz45BjtT35w9p3qPC3akwpBrSEWH88y
 PpEbVvNlyiNXi68ktf1Vqn4JTbFeWqIsNRuqK1C8Ad/6NVVug0q9bS6c7AOXLnGDUXmSonoY1
 HTbn8HodU7u3YbBsV3oqE8M3TeT+FpdJYUPvPij89T2dFyQelJgSZnDsWq/Pz8mY5e6tKA00l
 A9VMqLrRXKe+T6B3K/CoYZbeTcP7CZJPusMCpF60d8ww/LvyYms7rsK6+JpInPqG9XGxTVyfp
 G/xGg7rukM7jJ0K1TOolAiHMlZTyhoYSBjPd0rf4Xun6kIm11wPz1meb94Xk+iAKOQkOfxBRC
 ndFVjGKhXgbyRC/VpsEJxQMBZN3e7rNCYfEcx8G88qbvg3z8N6HtQAlcMJIzr/rm7HTTllt0q
 KGPeBhHT2kmXkMHhlswF3H1ynFKr0r6Oh61hwjOTAG465ilQLt+BFpfWJZY9C48JYs45PFEvO
 fPhkKPmGXsnyNYbHlQ3USSHyFCNKUMCj0Dorl5MwIDVjVoKqu+LNNL7tysfPK1FPW6GPWL3O+
 /zq7svaKVH279ny44Qz2u0dkI4SXdrALg9Us+ddq1eiDHOUEI+JzvsRlxBbpdJvxGyPU9EJhE
 krd5/gfF9ZFfyfX0tCF/Io6V1lQwO9EPYEVZQWsvN7LbZpDqfO6LjXsyZz3hjXbfo4jxQeYKl
 zDs0/Gzm8xaQFp2yNmv2lo5xYXYTPpCH+1bzq17F1soc0+8C9jcXwSSfDw/9F/W4eUQSlgcsi
 Eia6MGhUR6Z0gsBEtSa1PDPaF22OiH0KfzEKROivfLBIZeVB562bmPbt8V/mXL92AMLBD87N2
 stD60zyWqw1U+8DsqL8eOPOkvUueUPZvlkcwxtQCGr6eljTXf29l8DscQrQbBSLcdBW7glXAF
 k25wLMrcPCRB7nrK20zVmJrESB5/MlzwPwtTA4otTsZuwLFQ8OtzIsE6ASeGRB9Cx9z7WJlO4
 GzMj3qy/qQRgAXquKUmiESwzUwCMnWVbJFP9AfJxsSB0jIn5uDqmuJS0Pk+GhYgLxTSmD/YTI
 uPdpMo/nRxVOIcms5FXM6s+cSJX3pYNOhN5Mva2d2QO6jQBMZYRyrPbYAKD90hh1yplHx3lpC
 4oOMK0HOwsXrEhBT+ETtZUZ1A+m5nSBUowxUV+rfuvwAZZ0YyHbUPAkmboc4v8auUmBKKiwZg
 tmKrONTrMw9csxXUHGNZ9ZaiMpjNVuik9mgK4xDeG3aoQp1XWRorima47V5S7lBUQ7ABnJWSD
 Z/k+60PBSWSnO0eArHHYaJuPlMvWKvi7IpDYIvjhy7bVwNegduj2YvsTqkYa73eXYPtNP/arO
 LL2dipDtOulXF7alt/BMivTGsplnKo2ucWXwBCU/59PxiHnZRgYnybocHxBylcjgGbkMgu+Z0
 VwU5k1D+cmWDneqrR0fqOCBX3K3C4yOt7NPM81FYJ8DfsmEtTe9Q3EtJxeMbdx8tatW0vvz12
 uiWxxF6WO36jUWJYx24uQI8IXSLIzQqLBPiR3V6ojOx1oGPHVEdCPXb9Bmu+Hble01EzFYmb5
 p68CnOOXRualrFYQkXg3qHEPyGNKO99+oFvWdQMUsVDgJPB/Lp34R3qTXOzWr3UO3wEostLyL
 03oNhDFO+IqbHJloNstM1EICBjHYYIBEFCPeuuOvqMC3ZZ6dbY3G+vuAMp5A1KJdUYOxx4nL/
 9vQutrx68On7ZANLb23wkhYuh9x8oprwkBkfalfBhtsdK4RapsGu8dwWWZIt2ihhL7lGkvBeZ
 2UYWSgC0IyICHdB68HPy7sdSIk9jQTdotbylxVg8a3DS4Pje/3CCgOp0xIf5FjfxjZd1vLJF/
 YnVTS2KNdgNnJH2O3MytmSDcJJblmfp4ZFmog1XBXbMjyCK3lhhv1q2n5sy1RKOgPwdF4Vudv
 1hN2+tqQoihMs8m8QcoTitgJDRAsbV0wL263ayD0dS6frECMN/XZyjFL3BPi/m+EOeQZ0y6tQ
 UT/iM4ZZ6GWFTM3x8j1xSNzLGEAO49ln+Ep3I7AxdelRM10hjYs96J9H9hfoYC+0VrMTlKfYf
 ftInWxkPGdYLyI0dohR+r0QV7i1qIOjbjcnlZ21/mLFYCSet7vTqkUMoHkZFQKrI6loarM/gT
 GjGYZfG0AhDZXU7NPxeuKzrXUw+4mmaFMsvvvn8mxv1gkW7mO1nVFY6UX/orDBSH6meYOukdi
 LC15UPJTF4SW+VEIPxbdHtvIfSz6RGj8P3ERUDXUZ0ZcFdG0HxpHtRbgvVqpoU6bHKYh7nA71
 j0mYJsh7A8xAMd8PNH3jBEY87Qx5MPP7FP9zra4Ayy8pNdFsNbTlPBiB5zgtiNHcF2VFtst40
 aodtBdThj3kbBVE9ZDntphypRkMH0/S4urWRzK5mavE2R0gy+lJJeYaRXSKgstUtS6HZm4PlK
 RIvDtY77lFlKKGo1s9y05VRnNXmM5k62n0WJK+RKW91zA88TUDcks8KVdCc93nhv3yixKCGPv
 vGki+KNN7roECbkI8xvfJH1fUse4z0rQnMEvgyY7L4t7hmUESxpWpfWThlmktM8PzV7LpbzLu
 LDXCzQYtYOoFEWC5yS8pUKRj3ZF/FQnvANo0ARKm68ldYTlvemk1VTbdL9Kbkz6jXMCe/LfSn
 dd/vAp/kyr3mxIbphoIkSG/tAystrq4qI+7psc3/phVjhCLcH+o7o7QrHAHAyT3UV5W6RakYu
 8s/pCF9D9urrkfSFRzO5xecsAuf1z2zITDTM4kA6XSVYuXZM1yV3LnJQWBC41p6GAVwOAIExz
 nzYyD37UHk6LHY0gILCAz3NfG3jDli39LadXChyfz2ZYazAjtIcer9m4CGFHOJm0U0dK/+NIo
 S553lA/JhizYBaa0E2p1ZDDIgkSSsr2zMANr8pcW2ZXX+bxnkiSFqZVs7VUfnTHIKlRUWQ87p
 1/JVGzXZNy37yK5i62lB0sgDGikiUtjyaSf6W8h5XFLHtO2GPWCo0V4bnQIJiXSD+OlyEaFpG
 mHRWmhx3WFekPbnt5T44O7KTdmOSbiwQTDRJvSqo/dD1x0IHCmkTHRGUJrDMruA/K1/UzG2wX
 t/312RHNKB2bvtd4cAJuMujZsZTQh2ABY6X5RIgblICr6gQh9bhpyZKnbfzIZE1BEGG1Eu+a4
 nQU4VClT2QHPjEIrR8+WY6FC4fA0JdJroGWNYIikF+mERMydKLDgV6XHB7suTZmNOlDqhTbzt
 mNkwEe7PFLPXENzcKAQNtyiWKNyxGFd/PNFD+ufnjqh7KgkaR5fX7j7F+q8D21iE3aYPbrcRs
 ndK2Bn9P74qAdx9L841eKAnJjHXJ1ON6i/qX7VPP3AFDuKFaKuPGiibGNYR/55ONlBeaPVorv
 bj3Klnu19t+B8x/qrN3/V27T+psZeaAp6l2GTcgt0ELY1U3U/CRDUpj9nqURiigh9ktdDpemr
 KK4SGAJOq2Cr34db2J8zKYmMlFaftUJZchP0nSbe3EtyZRTqEXUYnleXgKyZlu7I9sSg==
Message-ID-Hash: K3M6PE2HN7SVEO3QPP2UF6RCFCATQLQ7
X-Message-ID-Hash: K3M6PE2HN7SVEO3QPP2UF6RCFCATQLQ7
X-MailFrom: maximilian_martin@gmx.de
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
CC: Maximilian Martin <maximilian_martin@gmx.de>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/K3M6PE2HN7SVEO3QPP2UF6RCFCATQLQ7/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Maximilian Martin via Devel <devel@lists.libvirt.org>
Reply-To: Maximilian Martin <maximilian_martin@gmx.de>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1755528133081116600
Content-Type: text/plain; charset="utf-8"

From: Maximilian Martin <maximilian_martin@gmx.de>

Adds documentation for the new USB bus/port addressing.
The new "port" attribute is explained.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/513

Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
---
 docs/formatdomain.rst | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 9f7311b6d5..687d00c56b 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -4837,19 +4837,22 @@ or:
    tweak the loading process further using the ``bar`` or ``file`` attribu=
tes
    will be rejected. :since:`Since 4.3.0 (QEMU and KVM only)`.
 ``address``
-   The ``address`` element for USB devices has a ``bus`` and ``device``
-   attribute to specify the USB bus and device number the device appears a=
t on
-   the host. The values of these attributes can be given in decimal, hexad=
ecimal
-   (starting with 0x) or octal (starting with 0) form. For PCI devices the
-   element carries 4 attributes allowing to designate the device as can be=
 found
-   with the ``lspci`` or with ``virsh nodedev-list``. For SCSI devices a '=
drive'
-   address type must be used. For mediated devices, which are software-only
-   devices defining an allocation of resources on the physical parent devi=
ce,
-   the address type used must conform to the ``model`` attribute of element
-   ``hostdev``, e.g. any address type other than PCI for ``vfio-pci`` devi=
ce API
-   or any address type other than CCW for ``vfio-ccw`` device API will res=
ult in
-   an error. See the `Device Addresses`_ section for more details on the a=
ddress
-   element.
+   The ``address`` element for USB devices has a ``bus`` attribute to spec=
ify
+   the USB bus. In addition, either a ``device`` attribute or a ``port``
+   attribute is required to identify the device on the host. While the dev=
ice
+   number is assigned upon connection of the device, the port number is a
+   stable identifier of the physical host port. Bus and device number can =
be
+   given in decimal, hexadecimal (starting with 0x) or octal (starting wit=
h 0)
+   form. The port number is a dotted path (examples: ``2``, ``1.2.5``). Fo=
r PCI
+   devices the element carries 4 attributes allowing to designate the devi=
ce as
+   can be found with the ``lspci`` or with ``virsh nodedev-list``. For SCSI
+   devices a 'drive' address type must be used. For mediated devices, whic=
h are
+   software-only devices defining an allocation of resources on the physic=
al
+   parent device, the address type used must conform to the ``model`` attr=
ibute
+   of element ``hostdev``, e.g. any address type other than PCI for ``vfio=
-pci``
+   device API or any address type other than CCW for ``vfio-ccw`` device A=
PI
+   will result in an error. See the `Device Addresses`_ section for more d=
etails
+   on the address element.
 ``driver``
    PCI hostdev devices can have an optional ``driver`` subelement that
    specifies which host driver to bind to the device when preparing it
--=20
2.39.5