qemu_capabilities: Stop detecting QEMU_CAPS_OBJECT_MEMORY_RAM

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 63590f139f0fe41ff928cc2438dbd97b77773d4c..afcd69952b09a21aff0a857cfaf5a10e913c9b84 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-ram", QEMU_CAPS_OBJECT_MEMORY_RAM },
     { "memory-backend-file", QEMU_CAPS_OBJECT_MEMORY_FILE },
     { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO },
     { "iothread", QEMU_CAPS_OBJECT_IOTHREAD},

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 8223d13409cc9363d8807f85b3c426d72b280d9c..847de7b133147148de83ed647714b185c228bf54 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -44,7 +44,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 96baa4e7bf232954f86eeec7bb63b5cdf13cbcfe..75f55c5ceb362b36c7ddcccac93abfeb34d98ac3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 6cd7256b0d34de370a6e7f052002765365f62ce9..abb15f7cf0edbbd3b1aebded4c9f5f6821d74296 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -23,7 +23,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='enable-fips'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='iothread'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 245a0bd2fb0fee03db71a985d893c7c7ff967301..22becc1752eb61b8a6292306c2e19a961c26f963 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 250ad9d9146f04ccba8d7b0f5106077d57f671a4..5920084f69e6c3ed9bcccf6751eeff5141b61828 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index e356f431c25085b909ebf20b61799ea316c3abc0..fb0a7d1afdff9cc669b700e4ec7db04460fd7604 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -44,7 +44,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 19edb90927d320e8e7067b8bd433e70a3667bcc9..9d168d71a0341de73d78c6bfdda1899e31e4425d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -47,7 +47,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 46bbfac18602a5d6c352d4151407ecf4d3bf7567..e9a663dd7fec62927a2f1fa1c6bc349bfdad288b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 93ae1b6d0a8c41213e223d087a75ed8af9cedfc2..960153b7fa045d47d2d81d75bb041e911cc03f80 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -15,7 +15,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='enable-fips'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='iothread'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 9dbe8f1ca809d8e746d7099d8970b5abc8179745..d907b26bc4aa513ae59fa9d7805990bd77454ab4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -57,7 +57,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index f4c9ad1bc4dc201b81fee39cf440c5f6cf1a5847..93bb657a35d7bdf3c9b51e068051f3ade1eb4816 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -45,7 +45,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index b40b8a573548f76cb234c2fe48fcc6fe573c23a7..c6a8f0c712eca492ab73591af2475db947e74a94 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 7b4915b67fc1a803d7f1cb1dabb120d99d149f5b..f1c392563a5cb0ad10fd0ea4e82596410d9f07bb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -46,7 +46,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 40a4a8b19d5c67bee268297e35ba8849f042db7b..71f5741ca24ddcb536ec703eb15f7d64f6053ef6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -22,7 +22,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='iothread'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index c71275506a0686c3fb32be520620609da46a6daf..991c146bb723ae2cebd22e6acb7868e4fde9224c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -56,7 +56,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index e38e8fa5f5ee642f169cf4f4035ffd5f222b93ba..a2606fe46b5827b55d5a0cb41322b55875a0f7a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -44,7 +44,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 3b6e8a0a479306fd40e0652c27051f9aaf3b3737..d4d3adb968404454f4d5638502c571164fd58820 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -22,7 +22,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='iothread'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 876a5afe43203e80f4e002ea8b20eb5fb0897c10..785ac2ca754ab2f534a04342d23a6540a732ffe5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index f73c070c9e8b6b7387724b97cc81fee111efbcbf..1fa14964c52287c9428db14d860d75b32ae25416 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 234f386736a2ac1b3ee9845d4605f59eb6a3ab9e..dd9a63e9e6c915c12f4fe4d9870c50c684bfd1ad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 4e90d3953a99d22d314f2ee5d4d1c7070611c09f..20d7b33de607d39ded0224a3304b724c1feb1949 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index fd57627ad54c3f92a485c7fc195f5ccebd22967f..0fa7d84386af0bf966f1a2cb37c12f1dd95d1d03 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 19a6c3335372ac0b08125192f559b42ad4d65f12..e399d1abf159931ff0b0ef8969677bc3f85a4d91 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 0d3c321a679688a84ffebde2c68dc0e3fd17b22a..771734470b6f443d2ed5c70859d9b1ff27049722 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -49,7 +49,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index dc7b041294bf8bddf8095850f2e4068aa2326dfc..52316300728aa2bd15e1dbbcbb48452be3f2da5f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index d2d1295c0e099060966fd268ebb945b9edf62f05..c7f56f56e2bff4cd07f1d11ff9b936d69dc24a37 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 6c56dc98176ae964db8ecefd66c3addd677a72b3..c681b6b1cd02a2a1d085a86fa4c85bfa448dbef7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index e3134541a48ea0315c73bbe4e2550e17a7b876e6..22d943e2e63bddad20e147b32bfc0ec525b9b30b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -55,7 +55,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
   <flag name='usb-audio'/>