]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_capabilities: Retire QEMU_CAPS_USB_STORAGE_REMOVABLE
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 19 Jul 2023 11:28:07 +0000 (13:28 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 19 Jul 2023 11:34:25 +0000 (13:34 +0200)
Now that the QEMU_CAPS_USB_STORAGE_REMOVABLE capability is no
longer used we can stop querying it and retire it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
32 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.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_riscv64.xml
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml

index 85ea879f0ba3f2b22b9e9931f1ab5577150b721d..8322b0f6e0846a61e46bbfffe94165446878c8e5 100644 (file)
@@ -280,7 +280,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */
               "q35-pci-hole64-size", /* X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
               "usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */
-              "usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */
+              "usb-storage.removable", /* X_QEMU_CAPS_USB_STORAGE_REMOVABLE */
 
               /* 155 */
               "virtio-mmio", /* QEMU_CAPS_DEVICE_VIRTIO_MMIO */
@@ -1471,7 +1471,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = {
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {
-    { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = {
index 2460fa7fa0ede664bad9b8fd56fcadf986105c9c..24014f03c2147262a8217900848cf04d31a050dc 100644 (file)
@@ -258,7 +258,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
     X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
     QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
-    QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
+    X_QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
 
     /* 155 */
     QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */
index 6a7f33e3c6af342ef0db8b06ac498e848aa9e417..0c5e9176586728207eb6bbc54c74b83e2aa5c868 100644 (file)
@@ -37,7 +37,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
index 2064f07c9c08c993352535c477ab6acd1b3dabd3..c7b35dd1d62d3e2074ca2f51b99632fcca658e8f 100644 (file)
@@ -38,7 +38,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
index b45d4a629328f6176b1b6b96af2f3d49c61f1ff6..c2f9dd8add935797a0278198591650c80e00f2b8 100644 (file)
@@ -47,7 +47,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index a2b7214b8abf9dff27219950df40784c0b5a71e5..8e26b07d2375dba9855c6331462508ba3a3f84e7 100644 (file)
@@ -39,7 +39,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
index 16333ba4995987babab50fa37a2f5192aaf94277..03a47bf713819fabea08904bd4c5c73e5290569d 100644 (file)
@@ -39,7 +39,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
index 09a71875ef8a6c764f35a8d00c132f1f9515aac8..a9f81c0180a234d49eb443ddd89618f3b73518ee 100644 (file)
@@ -41,7 +41,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
index 5331cf0113aaab0763c6ebe6f1df1d8043329691..c84821dd4b36e020fcfcb9432a76bed554be8519 100644 (file)
@@ -47,7 +47,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 1c3d3ea2a9a2acdd487a5e07ea15d1a5aebdf606..c8ee59313137a3154d74827e80b4e3bf44e112ec 100644 (file)
@@ -47,7 +47,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index b1c5c21abb960c17f19ec3c99b128a1d50c814af..131f31b597eb33317622995e0d5333bc1bc7a3a1 100644 (file)
@@ -39,7 +39,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index 9db85dafeff30b320b7c1adaf1f79b980db8eb1b..c719334258f14087003ff4764c6e8615818e1ff3 100644 (file)
@@ -39,7 +39,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
index 4d03004fa1169458961e62e353d56c697ca31f2e..fecbf3ef691adc558437e39a74160ad199b2e9d9 100644 (file)
@@ -41,7 +41,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index 654fec58fe0d96c6d7cd63ce6cfa10cf8a9a652a..86123439c46f1fdcf2ac2e73aefa9a66eb8b5938 100644 (file)
@@ -47,7 +47,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 6faf407a97ef0dc992b5edda01c3f80a1ab57824..ca69f1b45e49162cb54e696f40b876cc3e082421 100644 (file)
@@ -38,7 +38,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index b1bf3caecf155108109889d9aba072febffd432b..53876effa8b521360029ba3290e00dcaed48f2b3 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 13d909e382239a3152beb405cd2553dfdf2a89ef..667e60b08798fa2a65af2c37fdc2cf6f5dc87b04 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index e312801b8947b9071e06ba3bfbea8a48a31d496d..16d8a2108132c9bf6a05d99cd2701aee97d41aa0 100644 (file)
@@ -43,7 +43,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index e6b0bc03f4dbee93d14aefb1b03dd7cb2cd7212c..f25eacd8fb1dbdf1f6e5c41b41bf27128d37d19c 100644 (file)
@@ -39,7 +39,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
index e1758396b0de9bbacc80ea1d9ea4b6b5c172ecb7..8a3c0192b54bb2c09c99a1ca7f5e86a2bc0a18ca 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 3517e81d15deb5370fbcb39ea1dfa00098784b9a..13259cce7992d5d96022518068ba757f7b66bdf3 100644 (file)
@@ -42,7 +42,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index 58db75d1d71f9bb3f35c8716edd6a4693296ce43..1f08d3d696f64994d4340a960fd6651954c1c25d 100644 (file)
@@ -43,7 +43,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index 40130f180f853f2453224e60547dd2f5b4efd794..49efb980401af0a81bdc51ddb6f2e31251210689 100644 (file)
@@ -45,7 +45,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
index b7446435a6f7a3ba6635b61c95685db89effbe51..00bf47f46a80159d74dfd133c7e540123ac538d8 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 6bc39b85f7d941badfa68945b840f5cdb25ac04a..23067034021dc3f0ef2cd52845a822f1a7979de9 100644 (file)
@@ -44,7 +44,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
index 649269570520cd707c6a656655a57b92ad62841d..9edf6a9733c13d3c6fb21d15553e8246586ef6f5 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index f190be552a99d130f49680334e74f3c00337794b..e80fd7cc25700e1f56394d468ba333242709cd7d 100644 (file)
@@ -43,7 +43,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='usb-audio'/>
index c08a99e7348c631c1a790a7466069f6ce2123159..06ba71e1dd5c6e21f987ca539b55653551309481 100644 (file)
@@ -45,7 +45,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 37933c08483566a642abd3ac1a09d7a0bd61d1f2..e726c5ca9772e7d673af39a56f6110fe40740775 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 4c5e72ba5620ebc9944b95e99575a1d425eda71e..8286806239273096a9d6788ee15a642913058e40 100644 (file)
@@ -36,7 +36,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
index cd5341f4fab9192f3ceea90a34e80f310906708d..e6174532aaac5dc7a8d0e31b3d8bb44806f29122 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
index 475496a8c8ff6f0a106f487301439cf84d387479..6ee08a5099f4fb1bc9fddf2b6e4772c84aaaf1a6 100644 (file)
@@ -46,7 +46,6 @@
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
-  <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>