qemu_capabilities: Add QEMU_CAPS_DEVICE_USB_MTP capability

This capability reflects presence of -device usb-mtp. Signed-off-by: Rayhan Faizel <rayhan.faizel@gmail.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2024-12-22 13:45:38 +00:00 · 2024-03-09 01:46:45 +05:30 · 2024-03-09 01:46:45 +05:30 · e529b7b5c4
commit e529b7b5c4
parent 478774eada
38 changed files with 39 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -705,6 +705,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 455 */
              "blockjob.backing-mask-protocol", /* QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL */
              "display-reload", /* QEMU_CAPS_DISPLAY_RELOAD */
+              "usb-mtp", /* QEMU_CAPS_DEVICE_USB_MTP */
    );


@ -1392,6 +1393,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "virtio-crypto-device", QEMU_CAPS_DEVICE_VIRTIO_CRYPTO },
    { "cryptodev-backend-lkcf", QEMU_CAPS_OBJECT_CRYPTO_LKCF },
    { "pvpanic-pci", QEMU_CAPS_DEVICE_PANIC_PCI },
+    { "usb-mtp", QEMU_CAPS_DEVICE_USB_MTP },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -684,6 +684,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 455 */
    QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL, /* backing-mask-protocol of block-commit/block-stream */
    QEMU_CAPS_DISPLAY_RELOAD, /* 'display-reload' qmp command is supported */
+    QEMU_CAPS_DEVICE_USB_MTP, /* -device usb-mtp */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@ -105,6 +105,7 @@
  <flag name='virtio-blk.queue-size'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>4002000</version>
  <microcodeVersion>61700242</microcodeVersion>
  <package>v4.1.0-2221-g36609b4fa3</package>
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@ -105,6 +105,7 @@
  <flag name='virtio-blk.queue-size'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>4002000</version>
  <microcodeVersion>42900242</microcodeVersion>
  <package>v4.1.0-2198-g9e583f2</package>
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@ -143,6 +143,7 @@
  <flag name='virtio-blk.queue-size'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>4002000</version>
  <microcodeVersion>43100242</microcodeVersion>
  <package>v4.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@ -117,6 +117,7 @@
  <flag name='virtio-iommu-pci'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5000000</version>
  <microcodeVersion>61700241</microcodeVersion>
  <package>v5.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@ -120,6 +120,7 @@
  <flag name='virtio-iommu-pci'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5000000</version>
  <microcodeVersion>42900241</microcodeVersion>
  <package>v5.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@ -112,6 +112,7 @@
  <flag name='virtio-iommu-pci'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5000000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>v5.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@ -152,6 +152,7 @@
  <flag name='virtio-iommu-pci'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5000000</version>
  <microcodeVersion>43100241</microcodeVersion>
  <package>v5.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@ -156,6 +156,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5001000</version>
  <microcodeVersion>43100242</microcodeVersion>
  <package>v5.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@ -124,6 +124,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5002000</version>
  <microcodeVersion>61700243</microcodeVersion>
  <package>v5.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@ -125,6 +125,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5002000</version>
  <microcodeVersion>42900243</microcodeVersion>
  <package>v5.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@ -117,6 +117,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5002000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>v5.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@ -159,6 +159,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='usb-host.guest-resets-all'/>
  <flag name='virtio-crypto'/>
+  <flag name='usb-mtp'/>
  <version>5002000</version>
  <microcodeVersion>43100243</microcodeVersion>
  <package>v5.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@ -135,6 +135,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6000000</version>
  <microcodeVersion>61700242</microcodeVersion>
  <package>v6.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@ -171,6 +171,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6000000</version>
  <microcodeVersion>43100242</microcodeVersion>
  <package>v6.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@ -177,6 +177,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6001000</version>
  <microcodeVersion>43100243</microcodeVersion>
  <package>v6.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@ -148,6 +148,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6001050</version>
  <microcodeVersion>61700244</microcodeVersion>
  <package></package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@ -137,6 +137,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6002000</version>
  <microcodeVersion>42900244</microcodeVersion>
  <package>v6.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@ -179,6 +179,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6002000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v6.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@ -156,6 +156,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6002092</version>
  <microcodeVersion>61700243</microcodeVersion>
  <package>v7.0.0-rc2</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@ -156,6 +156,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>6002092</version>
  <microcodeVersion>61700243</microcodeVersion>
  <package>v7.0.0-rc2</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@ -155,6 +155,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7000000</version>
  <microcodeVersion>42900243</microcodeVersion>
  <package>v7.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@ -185,6 +185,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7000000</version>
  <microcodeVersion>43100243</microcodeVersion>
  <package>v7.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@ -156,6 +156,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7001000</version>
  <microcodeVersion>42900244</microcodeVersion>
  <package>v7.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@ -189,6 +189,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7001000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v7.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@ -151,6 +151,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7002000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>qemu-7.2.0-6.fc37</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@ -193,6 +193,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7002000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v7.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@ -193,6 +193,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7002000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v7.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@ -139,6 +139,7 @@
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>7002050</version>
  <microcodeVersion>0</microcodeVersion>
  <package>v7.2.0-333-g222059a0fc</package>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@ -197,6 +197,7 @@
  <flag name='rbd-encryption-luks-any'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8000000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v8.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@ -120,6 +120,7 @@
  <flag name='run-with.async-teardown'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8001000</version>
  <microcodeVersion>39100245</microcodeVersion>
  <package>v8.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@ -199,6 +199,7 @@
  <flag name='virtio-blk-vhost-vdpa'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8001000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v8.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@ -164,6 +164,7 @@
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8002000</version>
  <microcodeVersion>61700246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@ -171,6 +171,7 @@
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8002000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>qemu-8.2.0-7.fc39</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@ -120,6 +120,7 @@
  <flag name='run-with.async-teardown'/>
  <flag name='smp-clusters'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8002000</version>
  <microcodeVersion>39100246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@ -201,6 +201,7 @@
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8002000</version>
  <microcodeVersion>43100246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@ -203,6 +203,7 @@
  <flag name='virtio-mem-pci.dynamic-memslots'/>
  <flag name='blockjob.backing-mask-protocol'/>
  <flag name='display-reload'/>
+  <flag name='usb-mtp'/>
  <version>8002050</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v8.2.0-952-g14639717bf</package>