All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 -
29 files changed, 29 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 93a9275196..a16abbd02a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
{ "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
{ "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
- { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
{ "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
{ "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
{ "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index ccb2c48947..d00ebaa0aa 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -100,7 +100,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index f9e6fa70d2..3d4b99246e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -100,7 +100,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 5f813be761..05539c5822 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -68,7 +68,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 48dc757437..6a16855793 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 1b5efa794b..2f19631357 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -103,7 +103,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 1048ca36f6..3bde244867 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -104,7 +104,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 18f2f64b6f..a7b2645933 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -98,7 +98,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 2685aef4a1..28a67ce62f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -134,7 +134,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 87ec61c159..7bd777592f 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -33,7 +33,6 @@
<flag name='iothread.poll-max-ns'/>
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 6df3bcbb63..bd38a09580 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index f9bd66200e..02d5cbf811 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -103,7 +103,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 5b4e360388..7a8e1bfaf5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -102,7 +102,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index e5e50743a0..543f8cccdb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -96,7 +96,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index b2d7a90f15..2ff49c542f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -66,7 +66,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4ad736a7f2..b712ba2f79 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index ba08da19ae..7ad223562e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -103,7 +103,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index f5d231c2e0..ca14707e00 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -65,7 +65,6 @@
<flag name='iothread.poll-max-ns'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 9b781fd3fe..1744f632e7 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -133,7 +133,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index ed8b12c3af..2cd81bf751 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -131,7 +131,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index b333eb402d..2b8ea4b605 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -110,7 +110,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 5127408d73..387ff140c7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -99,7 +99,6 @@
<flag name='machine.pseries.cap-nested-hv'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 0347f5f812..e374621a44 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -131,7 +131,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 75e77af3f0..08aa68581e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -110,7 +110,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index d8f4404e5a..84f38f5df2 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -108,7 +108,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7d7478e520..c2465fad4e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -131,7 +131,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index f9f7e59ee9..a847b2ca19 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@@ -105,7 +105,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index efa91653d4..2192d1cef1 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -131,7 +131,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 50ae2b15c1..259769bd8a 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -131,7 +131,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='bitmap-merge'/>
<flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
--
2.37.4
