qemu_capabilities: Stop detecting QEMU_CAPS_OBJECT_MEMORY_FILE

All supported QEMUs have this capability. Stop detecting it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 329a120237fed78af5d3d1f95a612026c3a38412..fa814214ab50afcd0b908aced5cb0e98ec176eb8 100644 (file)
--- 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 847de7b133147148de83ed647714b185c228bf54..88e5a982f7d4b787bdecdcbd460459aeef9226a1 100644 (file)
--- 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 75f55c5ceb362b36c7ddcccac93abfeb34d98ac3..e30e025e296290ce0ad2eeea610d734d7544401c 100644 (file)
--- 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 abb15f7cf0edbbd3b1aebded4c9f5f6821d74296..f96bea190195c4d71f4cf7f4ef5daf9c8a33aa91 100644 (file)
--- 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 22becc1752eb61b8a6292306c2e19a961c26f963..c4599e2520b9a99d2c3256fcdbb69ab18f378d18 100644 (file)
--- 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 5920084f69e6c3ed9bcccf6751eeff5141b61828..c3d1c90195dd8576cd9397ae4820b16503d2c7a5 100644 (file)
--- 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 fb0a7d1afdff9cc669b700e4ec7db04460fd7604..899eabfc22b0ea98507b701af8669c4d755d9db8 100644 (file)
--- 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 9d168d71a0341de73d78c6bfdda1899e31e4425d..dc89b93e38be2cca673a7beeab2e6ff9ba1ccf83 100644 (file)
--- 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 e9a663dd7fec62927a2f1fa1c6bc349bfdad288b..7d95c8e62a5eb916cd3d89918a436722b312370a 100644 (file)
--- 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 960153b7fa045d47d2d81d75bb041e911cc03f80..44d8bec650bf1df8fcff7f261909cf5146391e12 100644 (file)
--- 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 d907b26bc4aa513ae59fa9d7805990bd77454ab4..f9e4031b14691a1440ada3bff3d944da1b937675 100644 (file)
--- 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 93bb657a35d7bdf3c9b51e068051f3ade1eb4816..d5f66fcbd84d38bb099e3b6c2b89892cb5ae65c2 100644 (file)
--- 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 c6a8f0c712eca492ab73591af2475db947e74a94..dd8f93e4cd0c1d6c774dbc870165f9c2cc3b5b49 100644 (file)
--- 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 f1c392563a5cb0ad10fd0ea4e82596410d9f07bb..f82171b523c72413d468facbd985ab396f3adac6 100644 (file)
--- 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 71f5741ca24ddcb536ec703eb15f7d64f6053ef6..1d9ccea5202d17d37727d55b709812d095447882 100644 (file)
--- 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 991c146bb723ae2cebd22e6acb7868e4fde9224c..b8bc71ff69100df2dee32d0674d5cbded714acc2 100644 (file)
--- 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 a2606fe46b5827b55d5a0cb41322b55875a0f7a0..37abd13332755f32bfcb9613f3b79a6f737e2ac0 100644 (file)
--- 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 d4d3adb968404454f4d5638502c571164fd58820..c946be426866039375e3229ffeaf170d8e34fc5a 100644 (file)
--- 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 785ac2ca754ab2f534a04342d23a6540a732ffe5..066e52697f1358facfd51e7ee79b8f1f41305b8c 100644 (file)
--- 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 1fa14964c52287c9428db14d860d75b32ae25416..513817c15c5570a825f883ce97dec24428bae7c4 100644 (file)
--- 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 dd9a63e9e6c915c12f4fe4d9870c50c684bfd1ad..249bfcea5456103b8e7ccea24f608e34894aad40 100644 (file)
--- 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 20d7b33de607d39ded0224a3304b724c1feb1949..8626b28acb715e058297101e3fc1eb84436734c3 100644 (file)
--- 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 0fa7d84386af0bf966f1a2cb37c12f1dd95d1d03..a3b66b344f216881d2f956be21d7f4698d22d28d 100644 (file)
--- 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 e399d1abf159931ff0b0ef8969677bc3f85a4d91..965e2da7947fbf833c8ee344948023dcf5099185 100644 (file)
--- 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 771734470b6f443d2ed5c70859d9b1ff27049722..2a4cf7b10096b7570a19c6cec182f7ad0d56da0a 100644 (file)
--- 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 52316300728aa2bd15e1dbbcbb48452be3f2da5f..7fb947b4267e981ce48e3cdee4bfbe971127bcf2 100644 (file)
--- 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 c7f56f56e2bff4cd07f1d11ff9b936d69dc24a37..85ac3b90d39e1aa2ff7f884f3cfa844f7ab6a40d 100644 (file)
--- 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 c681b6b1cd02a2a1d085a86fa4c85bfa448dbef7..434e148eebfad3aeb8f00bec237a00fa33eb6ea3 100644 (file)
--- 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 22d943e2e63bddad20e147b32bfc0ec525b9b30b..a486c390cbc6de10d22c4ca2f6e295b080560183 100644 (file)
--- 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'/>