]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_capabilities: Introduce QEMU_CAPS_DEVICE_USB_BOT
authorAkihiko Odaki <akihiko.odaki@daynix.com>
Sat, 8 Mar 2025 05:57:40 +0000 (14:57 +0900)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 24 Jun 2025 14:29:12 +0000 (16:29 +0200)
usb-bot is supported by all supported QEMU versions; it is present since
1.4.0 and libvirt supports 4.2.0 or later.

Add a capability just in case USB_STORAGE_BOT is disabled when building
QEMU.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
32 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml

index fe47282cb9b673571923d40b324bcd6550f68a59..cd9ea0816c14c13f362aef52befa1e0bf1d727f1 100644 (file)
@@ -740,6 +740,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 480 */
               "amd-iommu", /* QEMU_CAPS_AMD_IOMMU */
               "amd-iommu.pci-id", /* QEMU_CAPS_AMD_IOMMU_PCI_ID */
+              "usb-bot", /* QEMU_CAPS_DEVICE_USB_BOT */
     );
 
 
@@ -1427,6 +1428,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "nvme", QEMU_CAPS_DEVICE_NVME },
     { "nvme-ns", QEMU_CAPS_DEVICE_NVME_NS },
     { "amd-iommu", QEMU_CAPS_AMD_IOMMU },
+    { "usb-bot", QEMU_CAPS_DEVICE_USB_BOT },
 };
 
 
index 6f037cdb825d68aa175d72a244285826eda30807..966e30fa11c50ab5119dda547d222372f0c7cc63 100644 (file)
@@ -721,6 +721,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 480 */
     QEMU_CAPS_AMD_IOMMU, /* -device amd-iommu */
     QEMU_CAPS_AMD_IOMMU_PCI_ID, /* amd-iommu.pci-id */
+    QEMU_CAPS_DEVICE_USB_BOT, /* -device usb-bot */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
index 95752eb22341cf9bf91c23740b2660b9495cc124..200873b3a2b4523242fca2b6cf01ad25bf47c658 100644 (file)
   <flag name='machine.virt.highmem-mmio-size'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>10000000</version>
   <microcodeVersion>61700285</microcodeVersion>
   <package>v10.0.0</package>
index 12afb64af81d9bdd0debb3e3d7e69f0d8d319402..0c57798255720bee99db2a928bc2ac37d603aaee 100644 (file)
   <flag name='bus-floppy'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>10000000</version>
   <microcodeVersion>42900285</microcodeVersion>
   <package>v10.0.0</package>
index 032b527188a8accd1c2ed7f4c940180fc3a58dce..070e673d0b564e7b804ae0834318494b7552041d 100644 (file)
   <flag name='virtio-scsi.iothread-mapping'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>10000000</version>
   <microcodeVersion>39100285</microcodeVersion>
   <package>v10.0.0</package>
index 671c24c493186a82770a109dc137c128bdfb8117..c8104c967ff71efd39462835747e194cbb37516a 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>10000000</version>
   <microcodeVersion>43100285</microcodeVersion>
   <package>v10.0.0</package>
index fff083847b0ebc3dc7a925d59a77881494f2c449..ad1ffcff32e9da585584c369a2414ad650153748 100644 (file)
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
   <flag name='amd-iommu.pci-id'/>
+  <flag name='usb-bot'/>
   <version>10000000</version>
   <microcodeVersion>43100285</microcodeVersion>
   <package>v10.0.0</package>
index 7f4633eb36e59b472eb3e841ca8ad1dac0ef9886..31292f153fffd9d93a5d690fcf8afdd1a5a25c20 100644 (file)
   <flag name='bus-floppy'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>6002000</version>
   <microcodeVersion>42900244</microcodeVersion>
   <package>v6.2.0</package>
index 419ef752c4d6b33aedc04d06b8d373c6f85c4956..2f12e33818dbde9a8244ffa3dae7e76a4bc5f976 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>6002000</version>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v6.2.0</package>
index f57e72c3a1ee0119b03792a266edfdaf6c0ef8f4..affe9c7ed2c75b4a91ef11e5b6e7a5b73d4fc330 100644 (file)
   <flag name='bus-floppy'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>7000000</version>
   <microcodeVersion>42900243</microcodeVersion>
   <package>v7.0.0</package>
index ce83b18d1562e70ad5d52a5a5ca7daaf20751c7b..c24da85151e5cb6a49581c9e9ae2db6bbd59ea71 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>7000000</version>
   <microcodeVersion>43100243</microcodeVersion>
   <package>v7.0.0</package>
index 2f1996189dcb509e9fc62a0a7b41fe06fb34a22f..beafad1e70d045a984e6a4bec7ab7d7d5b8cb220 100644 (file)
   <flag name='bus-floppy'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>7001000</version>
   <microcodeVersion>42900244</microcodeVersion>
   <package>v7.1.0</package>
index 08efbf59b0633d10c2e5a6d03a3830e1fc9e0cb1..1a60fbb4d18223b2fe6eb9f0ea71b23b688689f4 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>7001000</version>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v7.1.0</package>
index 615dce08af97593d50b538b2fc19954808cf4b2c..8dcf050c54fbae728fd9063b1bf303e84134977c 100644 (file)
   <flag name='bus-floppy'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>7002000</version>
   <microcodeVersion>0</microcodeVersion>
   <package>qemu-7.2.0-6.fc37</package>
index 311e5d6b1b89e6fe0c1e187925c38e5cc78ce976..5afd3661d263ac49a4f5ed1f8a0236c673ba72b5 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>7002000</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v7.2.0</package>
index 48cf79ace944d7cdfd0f88a8479a1400f352c4d7..31bc690a0ba06ed6c68bf468681e202092a9843b 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>7002000</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v7.2.0</package>
index 415b617561d2644a6f2d607a07fae8d9a698c07c..b66eab47dec04ed0e3204a540fccae7f3bd00238 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>8000000</version>
   <microcodeVersion>43100244</microcodeVersion>
   <package>v8.0.0</package>
index 51e27e08c4b6d6e30d1de9efdcfa6bd019562c83..acbb7caa20a8ed8e714b77b66c1c7c5cf89e5f56 100644 (file)
   <flag name='display-reload'/>
   <flag name='usb-mtp'/>
   <flag name='netdev.user'/>
+  <flag name='usb-bot'/>
   <version>8001000</version>
   <microcodeVersion>39100245</microcodeVersion>
   <package>v8.1.0</package>
index 5b4ddcc29a5641fca0b41bfe3174a61f0f1171ec..94786bea7040a848a3fd9d154e36f00b16b2a981 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>8001000</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v8.1.0</package>
index e8c6201ec2327719345c5c77d8144c7a8579d8f2..95a141c521706798a51f6df1497d1240ea05d72b 100644 (file)
   <flag name='acpi-erst'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>8002000</version>
   <microcodeVersion>61700246</microcodeVersion>
   <package>v8.2.0</package>
index 96d602753dc0140165dabf26e60a33c26463f153..cb46dd1977d70d5b472bba0c4e111b7a0eab798c 100644 (file)
   <flag name='acpi-erst'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>8002000</version>
   <microcodeVersion>0</microcodeVersion>
   <package>qemu-8.2.0-7.fc39</package>
index ba8eaa2fe176015f8afb414f07a371d888fe8ebc..39e36e5aa0aa30cf49981b5626a70456702eaad9 100644 (file)
   <flag name='acpi-erst'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>8002000</version>
   <microcodeVersion>106300246</microcodeVersion>
   <package>v8.2.0</package>
index 37e98624ed107a6b09f74f3114cc30fcec0ca761..23e3bc827c3f129e9668de914b13a03afd85420e 100644 (file)
   <flag name='netdev.user'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>8002000</version>
   <microcodeVersion>39100246</microcodeVersion>
   <package>v8.2.0</package>
index 41645ffedd472ebf3ba2256e82811ff39db1fedc..a20c1dc3ba75205b8271abcddbf88ff7918ad16a 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>8002000</version>
   <microcodeVersion>43100246</microcodeVersion>
   <package>v8.2.0</package>
index 80b0807ed1a7098aaa69136d2c4dc8d3bccc0a12..a6190aba3c6e5a1a54069a406f3fd5d6696c8fb8 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>9000000</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v9.0.0</package>
index 5833e4b2697832168b18641722f20e0294f23206..0f7ce7ce1b3316cdf5f9968af69bb656460c7584 100644 (file)
   <flag name='machine.virt.aia'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>9001000</version>
   <microcodeVersion>0</microcodeVersion>
   <package>v9.1.0</package>
index c2f2377b8c36fdf4c76d3e0117756813eba78367..59e7207ed1dab5253a394964bd01d0dec9548ae1 100644 (file)
   <flag name='migrate-incoming.exit-on-error'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>9001000</version>
   <microcodeVersion>39100246</microcodeVersion>
   <package>v9.1.0</package>
index 037a2ac0f3fa0e9896e8a7f3247a8e9368daf198..bf463fbb77694dcfa39be267fff58b904fe80b26 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>9001000</version>
   <microcodeVersion>43100246</microcodeVersion>
   <package>v9.1.0</package>
index 179958d331f89ea00246c2a338f3d58c728b8841..aa964b4885a68f1eb9631a2a674eff52473066cd 100644 (file)
   <flag name='migrate-incoming.exit-on-error'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>9002002</version>
   <microcodeVersion>61700247</microcodeVersion>
   <package></package>
index 5bc535a4d17202f5b1099706275ae107bbf5e98d..27a9b4c9241e46405f88bc5f07d07b8bb3c30114 100644 (file)
   <flag name='migrate-incoming.exit-on-error'/>
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
+  <flag name='usb-bot'/>
   <version>9002000</version>
   <microcodeVersion>39100247</microcodeVersion>
   <package>v9.2.0</package>
index bd767a1afbb5c735e2021d45ea27ab1528e39d1f..b660de997a8b4f6eadbe6c33be4586d7bc97df50 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>9002000</version>
   <microcodeVersion>43100247</microcodeVersion>
   <package>v9.2.0</package>
index e6825dc9f6ac11ec4f07dbd4cb28c5173482be7a..bcc89fcff09954ca8c53d5aa63eaf93fca445ed0 100644 (file)
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='amd-iommu'/>
+  <flag name='usb-bot'/>
   <version>9002000</version>
   <microcodeVersion>43100247</microcodeVersion>
   <package>v9.2.0</package>