[PATCH 08/80] qemu: capabilities: Retire QEMU_CAPS_DRIVE_DISCARD and QEMU_CAPS_DRIVE_DETECT_ZEROES

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_capabilities.c                      | 6 ++----
 src/qemu/qemu_capabilities.h                      | 4 ++--
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 2 --
 28 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index cb47da9b1a..a01de90c29 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -270,7 +270,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 145 */
               "vnc-websocket", /* X_QEMU_CAPS_VNC_WEBSOCKET */
-              "drive-discard", /* QEMU_CAPS_DRIVE_DISCARD */
+              "drive-discard", /* X_QEMU_CAPS_DRIVE_DISCARD */
               "mlock", /* X_QEMU_CAPS_REALTIME_MLOCK */
               "vnc-share-policy", /* X_QEMU_CAPS_VNC_SHARE_POLICY */
               "device-del-event", /* X_QEMU_CAPS_DEVICE_DEL_EVENT */
@@ -382,7 +382,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 225 */
               "spice-unix", /* X_QEMU_CAPS_SPICE_UNIX */
-              "drive-detect-zeroes", /* QEMU_CAPS_DRIVE_DETECT_ZEROES */
+              "drive-detect-zeroes", /* X_QEMU_CAPS_DRIVE_DETECT_ZEROES */
               "tls-creds-x509", /* X_QEMU_CAPS_OBJECT_TLS_CREDS_X509 */
               "display", /* X_QEMU_CAPS_DISPLAY */
               "intel-iommu", /* QEMU_CAPS_DEVICE_INTEL_IOMMU */
@@ -1591,8 +1591,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
     { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING },
     { "blockdev-add/arg-type/+rbd/encrypt", QEMU_CAPS_RBD_ENCRYPTION },
-    { "blockdev-add/arg-type/discard", QEMU_CAPS_DRIVE_DISCARD },
-    { "blockdev-add/arg-type/detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES },
     { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
     { "blockdev-backup", QEMU_CAPS_BLOCKDEV_BACKUP },
     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5a258d9bf4..cfa916c846 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -248,7 +248,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 145 */
     X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
-    QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
+    X_QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
     X_QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */
     X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */
     X_QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */
@@ -361,7 +361,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 225 */
     X_QEMU_CAPS_SPICE_UNIX, /* -spice unix */
-    QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
+    X_QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
     X_QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
     X_QEMU_CAPS_DISPLAY, /* -display */
     QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 3184b54dfb..9dfe93ef45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -40,7 +40,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -79,7 +78,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 0d1d7d709f..120e7221a3 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -40,7 +40,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 0d0878f911..9bafdc08ff 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
@@ -46,7 +45,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index fd68a0a068..2cb38642e7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 7da83d5437..e5fcc07d14 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -42,7 +42,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 9cf5648e51..8834e745dc 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -76,7 +75,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 97e0b95eeb..841e935438 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index f80ea261aa..89ed03e279 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 4ba06b3cb7..551c4dcb79 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -16,7 +16,6 @@
   <flag name='nbd-server'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
@@ -27,7 +26,6 @@
   <flag name='vserport-change-event'/>
   <flag name='spice-gl'/>
   <flag name='chardev-logfile'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
   <flag name='block-write-threshold'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index d580800664..e5d4b355b1 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index a79b5f75eb..3b30fae3b7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -42,7 +42,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -80,7 +79,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 9b2e7cbed4..f0a1c6d424 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index a9c3501108..4b3a7e4e0b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -80,7 +79,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 21737b1d50..62b6bc6e77 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
@@ -45,7 +44,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 75370d1afe..2f1dbec6dc 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 799e77cb79..6ab242ef09 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -41,7 +41,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 3c31cffa80..4b30f544e8 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
@@ -45,7 +44,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 1b59879e0f..935148a8a1 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -100,7 +99,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 25ccf44776..c4ae311be8 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 8cede64f5b..870cf154f1 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -87,7 +86,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index f74f1f3d73..a904dea43a 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index b1846bc64e..fecb2cb03f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index b7af87d6d7..5a47530d26 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -87,7 +86,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 5da35e4a61..46db0d7832 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7c7a08e6ee..99b4d860f9 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index d33336922d..06e1afe692 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
-- 
2.36.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux