Retire:
QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC
QEMU_CAPS_SCSI_DISK_DEVICE_ID
QEMU_CAPS_SAVEVM_MONITOR_NODES
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 9 +++------
src/qemu/qemu_capabilities.h | 6 +++---
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 --
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/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 3 ---
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 3 ---
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 3 ---
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 3 ---
28 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9cffb07b9d..d660b3b9f0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -521,7 +521,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"nvdimm.unarmed", /* QEMU_CAPS_DEVICE_NVDIMM_UNARMED */
/* 325 */
- "scsi-disk.device_id", /* QEMU_CAPS_SCSI_DISK_DEVICE_ID */
+ "scsi-disk.device_id", /* X_QEMU_CAPS_SCSI_DISK_DEVICE_ID */
"virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL */
"overcommit", /* X_QEMU_CAPS_OVERCOMMIT */
"query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE */
@@ -550,8 +550,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 345 */
"arm-max-cpu", /* QEMU_CAPS_ARM_MAX_CPU */
- "blockdev-file-dynamic-auto-read-only", /* QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC */
- "savevm-monitor-nodes", /* QEMU_CAPS_SAVEVM_MONITOR_NODES */
+ "blockdev-file-dynamic-auto-read-only", /* X_QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC */
+ "savevm-monitor-nodes", /* X_QEMU_CAPS_SAVEVM_MONITOR_NODES */
"drive-nvme", /* QEMU_CAPS_DRIVE_NVME */
"smp-dies", /* QEMU_CAPS_SMP_DIES */
@@ -1483,7 +1483,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
{ "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL },
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
- { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL },
{ "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL },
};
@@ -1586,7 +1585,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
{ "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
- { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
{ "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 },
@@ -1597,7 +1595,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV_LOGFILE },
{ "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARDEV_FILE_APPEND },
{ "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
- { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
{ "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
{ "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
{ "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7c5df0554b..5ca177b599 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -500,7 +500,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed= */
/* 325 */
- QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
+ X_QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional devices */
X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */
QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */
@@ -529,8 +529,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 345 */
QEMU_CAPS_ARM_MAX_CPU, /* max-arm-cpu type exists */
- QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
- QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */
+ X_QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
+ X_QEMU_CAPS_SAVEVM_MONITOR_NODES, /* 'savevm' handles monitor-owned nodes properly */
QEMU_CAPS_DRIVE_NVME, /* -drive file.driver=nvme */
QEMU_CAPS_SMP_DIES, /* -smp dies= */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index c801c11391..e1f69fbcde 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -119,7 +119,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -130,8 +129,6 @@
<flag name='vhost-user-gpu'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 702f6551a4..c78ae4ee45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -120,7 +120,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -130,7 +129,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='machine.pseries.cap-ccf-assist'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 290a663904..8c88873fc5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -89,7 +89,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -98,8 +97,6 @@
<flag name='vhost-user-gpu'/>
<flag name='query-cpu-model-baseline'/>
<flag name='query-cpu-model-comparison'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index a2e36da5bf..5fb954a7d2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -156,7 +156,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index ba0be2518e..c4e2fb70aa 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -122,7 +122,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
<flag name='vhost-user-gpu'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 15c4beea98..2c10b10122 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -124,7 +124,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -135,8 +134,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='machine.pseries.cap-ccf-assist'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9d24daa1a9..c170036059 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -118,7 +118,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -127,8 +126,6 @@
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 18970c1f90..bf43ded774 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -156,7 +156,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -170,8 +169,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 6052009362..ce86189e15 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -50,14 +50,11 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 630d69d8ff..ea5df78e4b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -155,7 +155,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 182694aca5..174bd93bf2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -122,7 +122,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
<flag name='vhost-user-gpu'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 14f648efd6..61ae1574e4 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -122,7 +122,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -133,8 +132,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='machine.pseries.cap-ccf-assist'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 09998c9564..612c73b851 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -116,7 +116,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -125,8 +124,6 @@
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 9c24f45f69..2cb60c98c8 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -87,7 +87,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -97,8 +96,6 @@
<flag name='vhost-user-gpu'/>
<flag name='query-cpu-model-baseline'/>
<flag name='query-cpu-model-comparison'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 25cbeaacf0..087b721a61 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -155,7 +155,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4e386dd29a..ca3dca4369 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -122,7 +122,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
<flag name='vhost-user-gpu'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 66763ef480..65cb666714 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -86,7 +86,6 @@
<flag name='iothread.poll-max-ns'/>
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -96,8 +95,6 @@
<flag name='vhost-user-gpu'/>
<flag name='query-cpu-model-baseline'/>
<flag name='query-cpu-model-comparison'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index b4f31cdebd..aabcac1f5d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -155,7 +155,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
<flag name='vhost-user-gpu'/>
<flag name='vhost-user-vga'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 67e68ce7c8..5d398181c2 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -153,7 +153,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 20ba835984..ec1a2d9cca 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -129,7 +129,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -142,8 +141,6 @@
<flag name='incremental-backup'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 2d1ca291a9..52b0af3d6e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -119,7 +119,6 @@
<flag name='machine.pseries.cap-nested-hv'/>
<flag name='memory-backend-file.align'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -131,8 +130,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='machine.pseries.cap-ccf-assist'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 7dc962f9c4..243fb41ca8 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -153,7 +153,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 7627b5b03c..5700c5e06b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -129,7 +129,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.align'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='machine.virt.iommu'/>
@@ -142,8 +141,6 @@
<flag name='incremental-backup'/>
<flag name='ramfb'/>
<flag name='arm-max-cpu'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 5710c609f9..b2d48cc081 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -128,7 +128,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -140,8 +139,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='machine.pseries.cap-ccf-assist'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 8c5aea8aa5..528be3c459 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -153,7 +153,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 84c598a286..a9cc271892 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -153,7 +153,6 @@
<flag name='memory-backend-file.align'/>
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
- <flag name='scsi-disk.device_id'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='query-current-machine'/>
<flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
<flag name='vhost-user-vga'/>
<flag name='incremental-backup'/>
<flag name='ramfb'/>
- <flag name='blockdev-file-dynamic-auto-read-only'/>
- <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='i8042'/>
--
2.36.1
