1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 14:03:49 +03:00

qemu: capabilities: Retire QEMU_CAPS_DRIVE_DISCARD and QEMU_CAPS_DRIVE_DETECT_ZEROES

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-15 16:28:50 +02:00
parent 9a7609a5da
commit f80829dece
28 changed files with 4 additions and 58 deletions

View File

@ -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 */
@ -1590,8 +1590,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 },

View File

@ -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 */

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>

View File

@ -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'/>