They are no longer used as we now assume that all tuning caps are
present and in case some will be removed we'll need to use different
probing methods.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_capabilities.c | 9 +++------
src/qemu/qemu_capabilities.h | 6 +++---
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 3 ---
tests/qemuxml2argvtest.c | 2 --
42 files changed, 6 insertions(+), 128 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ebccea2ace..abd5f0a0d0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -314,7 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 175 */
"migrate-rdma", /* QEMU_CAPS_MIGRATE_RDMA */
"ivshmem", /* QEMU_CAPS_DEVICE_IVSHMEM */
- "drive-iotune-max", /* QEMU_CAPS_DRIVE_IOTUNE_MAX */
+ "drive-iotune-max", /* X_QEMU_CAPS_DRIVE_IOTUNE_MAX */
"VGA.vgamem_mb", /* QEMU_CAPS_VGA_VGAMEM */
"vmware-svga.vgamem_mb", /* QEMU_CAPS_VMWARE_SVGA_VGAMEM */
@@ -397,7 +397,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 235 */
"virtio-vga", /* QEMU_CAPS_DEVICE_VIRTIO_VGA */
- "drive-iotune-max-length", /* QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH
*/
+ "drive-iotune-max-length", /*
X_QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH */
"ivshmem-plain", /* QEMU_CAPS_DEVICE_IVSHMEM_PLAIN */
"ivshmem-doorbell", /* QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL */
"query-qmp-schema", /* X_QEMU_CAPS_QUERY_QMP_SCHEMA */
@@ -405,7 +405,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 240 */
"gluster.debug_level", /* QEMU_CAPS_GLUSTER_DEBUG_LEVEL */
"vhost-scsi", /* QEMU_CAPS_DEVICE_VHOST_SCSI */
- "drive-iotune-group", /* QEMU_CAPS_DRIVE_IOTUNE_GROUP */
+ "drive-iotune-group", /* X_QEMU_CAPS_DRIVE_IOTUNE_GROUP */
"query-cpu-model-expansion", /*
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION */
"virtio-net.host_mtu", /* QEMU_CAPS_VIRTIO_NET_HOST_MTU */
@@ -3236,9 +3236,6 @@ static struct virQEMUCapsCommandLineProps
virQEMUCapsCommandLine[] = {
{ "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
{ "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT },
{ "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
- { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX},
- { "drive", "throttling.bps-total-max-length",
QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH },
- { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP },
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
{ "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also
checked fsdev->dmode */
{ "fw_cfg", "file", QEMU_CAPS_FW_CFG },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 673e26d502..231bfbbffb 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -293,7 +293,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for
syntax-check */
/* 175 */
QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */
QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */
- QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */
+ X_QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */
QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */
QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */
@@ -377,7 +377,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for
syntax-check */
/* 235 */
QEMU_CAPS_DEVICE_VIRTIO_VGA, /* -device virtio-vga */
- QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH, /* -drive bps_max_length = and friends
*/
+ X_QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH, /* -drive bps_max_length = and
friends */
QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, /* -device ivshmem-plain */
QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
X_QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */
@@ -385,7 +385,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for
syntax-check */
/* 240 */
QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */
- QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
+ X_QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */
QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 9029a4e832..00191146f9 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -41,7 +41,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -65,10 +64,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 37fb33e8e3..b41561fe2a 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -131,12 +130,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index a903b46ea1..8e25cc45cf 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -63,7 +63,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
@@ -99,12 +98,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 898156938b..2a47660a87 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -62,7 +62,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='aes-key-wrap'/>
@@ -94,12 +93,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 8d1e21c2a2..1aca50721e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -41,7 +41,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -65,10 +64,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 37aaabe0d3..68a8148f2f 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -83,7 +83,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -129,12 +128,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index a733043b0a..90369bffa5 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -61,7 +61,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='aes-key-wrap'/>
@@ -93,12 +92,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 9b486cdbbc..bc9d3d3026 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -31,7 +31,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -52,10 +51,8 @@
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='query-hotpluggable-cpus'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 8e895302c2..36ff32df3c 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -31,7 +31,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -52,10 +51,8 @@
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='query-hotpluggable-cpus'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index dfc1ce8fa7..da942731ee 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -42,7 +42,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -67,10 +66,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index f45fd84aaa..60fe8d5a53 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index d04834970d..0c2bf1c97b 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -62,7 +62,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='aes-key-wrap'/>
@@ -94,12 +93,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index dcc5f6f137..7413b047a6 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 2586f692fa..3e62d22da5 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -64,7 +64,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='aes-key-wrap'/>
@@ -101,12 +100,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index f408805d29..2762a28ce2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -63,7 +63,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -99,12 +98,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 8a6c02d575..5f279cf936 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -68,7 +68,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='aes-key-wrap'/>
@@ -106,12 +105,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 3be1d41c4e..fea285cbae 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -68,7 +68,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='aes-key-wrap'/>
@@ -106,12 +105,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 3f90bf38ea..4ad36429b1 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -42,7 +42,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -67,10 +66,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 7eff08235e..e00cd14597 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -129,12 +128,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 736b120547..3f9685306c 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -129,12 +128,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index b86a35ffc8..5dbc388349 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -64,7 +64,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -102,12 +101,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 40a25a0092..825b211334 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -63,7 +63,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -99,12 +98,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 5dbb8fbaf1..1cff2dee03 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -42,7 +42,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -67,10 +66,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 8352fd0200..5c26a5bf86 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c201c55f13..5d109ff918 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -66,7 +66,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -104,12 +103,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index c02998aa67..85f2253a9c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -64,7 +64,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -100,12 +99,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 95c0f70124..f0ba6094bf 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -68,7 +68,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='aes-key-wrap'/>
@@ -106,12 +105,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 6a99f4e343..9f170997d3 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 9e4f2f7c75..ce2140f68e 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -31,7 +31,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -47,9 +46,7 @@
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='query-hotpluggable-cpus'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
- <flag name='drive-iotune-group'/>
<flag name='spice-rendernode'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 674d984432..37a1a7c3a8 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -82,7 +82,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 417be4ec89..127511ce31 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -65,7 +65,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -103,12 +102,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 4202eb050a..a257c2620b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -63,7 +63,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -99,12 +98,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='nvdimm'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1409858554..90f4f21cb7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -67,7 +67,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='aes-key-wrap'/>
@@ -105,12 +104,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
<flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 372af71052..b0d6600519 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -41,7 +41,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -66,10 +65,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index ec3384cab8..9cea402a14 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -81,7 +81,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -130,12 +129,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 49c1da3d27..4f28db7ff2 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -64,7 +64,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
@@ -104,12 +103,10 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index aae6364e37..ff7e8be35c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -41,7 +41,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='aes-key-wrap'/>
<flag name='dea-key-wrap'/>
<flag name='migration-event'/>
@@ -66,10 +65,8 @@
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
- <flag name='drive-iotune-max-length'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d6198c2479..2fe898b91e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -80,7 +80,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -129,12 +128,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 933b8eb2b5..58c0f81b1e 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -80,7 +80,6 @@
<flag name='splash-timeout'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='drive-iotune-max'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='qxl.vgamem_mb'/>
@@ -128,12 +127,10 @@
<flag name='query-hotpluggable-cpus'/>
<flag name='virtio-net.rx_queue_size'/>
<flag name='virtio-vga'/>
- <flag name='drive-iotune-max-length'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='gluster.debug_level'/>
<flag name='vhost-scsi'/>
- <flag name='drive-iotune-group'/>
<flag name='query-cpu-model-expansion'/>
<flag name='virtio-net.host_mtu'/>
<flag name='spice-rendernode'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f7109fcbd3..8535287658 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3266,8 +3266,6 @@ mymain(void)
DO_TEST("name-escape",
QEMU_CAPS_NAME_DEBUG_THREADS,
QEMU_CAPS_OBJECT_SECRET,
- QEMU_CAPS_DRIVE_IOTUNE_MAX,
- QEMU_CAPS_DRIVE_IOTUNE_GROUP,
QEMU_CAPS_VNC,
QEMU_CAPS_NAME_GUEST,
QEMU_CAPS_DEVICE_CIRRUS_VGA,
--
2.31.1
