[PATCH 08/15] qemu_capabilities: Stop detectin QEMU_CAPS_OBJECT_MEMORY_FILE
Michal Privoznik
mprivozn at redhat.com
Thu Nov 3 16:22:06 UTC 2022
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
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 329a120237..fa814214ab 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1280,7 +1280,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA },
{ "pvpanic", QEMU_CAPS_DEVICE_PANIC },
{ "usb-kbd", QEMU_CAPS_DEVICE_USB_KBD },
- { "memory-backend-file", QEMU_CAPS_OBJECT_MEMORY_FILE },
{ "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO },
{ "iothread", QEMU_CAPS_OBJECT_IOTHREAD},
{ "ivshmem", QEMU_CAPS_DEVICE_IVSHMEM },
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 847de7b133..88e5a982f7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -45,7 +45,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 75f55c5ceb..e30e025e29 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index abb15f7cf0..f96bea1901 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -24,7 +24,6 @@
<flag name='vfio-pci'/>
<flag name='enable-fips'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 22becc1752..c4599e2520 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 5920084f69..c3d1c90195 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -47,7 +47,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index fb0a7d1afd..899eabfc22 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -45,7 +45,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9d168d71a0..dc89b93e38 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -48,7 +48,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index e9a663dd7f..7d95c8e62a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 960153b7fa..44d8bec650 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -16,7 +16,6 @@
<flag name='rng-egd'/>
<flag name='enable-fips'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='vserport-change-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index d907b26bc4..f9e4031b14 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -58,7 +58,6 @@
<flag name='enable-fips'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 93bb657a35..d5f66fcbd8 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -46,7 +46,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index c6a8f0c712..dd8f93e4cd 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index f1c392563a..f82171b523 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -47,7 +47,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 71f5741ca2..1d9ccea520 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -23,7 +23,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 991c146bb7..b8bc71ff69 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -57,7 +57,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index a2606fe46b..37abd13332 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -45,7 +45,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index d4d3adb968..c946be4268 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -23,7 +23,6 @@
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
<flag name='aes-key-wrap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 785ac2ca75..066e52697f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 1fa14964c5..513817c15c 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index dd9a63e9e6..249bfcea54 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -50,7 +50,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 20d7b33de6..8626b28acb 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -44,7 +44,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 0fa7d84386..a3b66b344f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index e399d1abf1..965e2da794 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -50,7 +50,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 771734470b..2a4cf7b100 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -50,7 +50,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 5231630072..7fb947b426 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index c7f56f56e2..85ac3b90d3 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@@ -49,7 +49,6 @@
<flag name='ich9-intel-hda'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index c681b6b1cd..434e148eeb 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index 22d943e2e6..a486c390cb 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -56,7 +56,6 @@
<flag name='pvpanic'/>
<flag name='usb-kbd'/>
<flag name='numa'/>
- <flag name='memory-backend-file'/>
<flag name='usb-audio'/>
<flag name='rtc-reset-reinjection'/>
<flag name='iothread'/>
--
2.37.4
More information about the libvir-list
mailing list