qemu_capabilities: Stop detecting QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD

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 7ebd18af1b754c7876e0acf01d2733b89679e809..f9b62680ba235cf8b7ea5735a9aed3f85477daa3 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1699,7 +1699,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
-    { "discard-data", QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD },
     { "align", QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN },
     { "pmem", QEMU_CAPS_OBJECT_MEMORY_FILE_PMEM },
     /* As of QEMU commit 8db0b20415c129cf5e577a593a4a0372d90b7cc9 the

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 88e5a982f7d4b787bdecdcbd460459aeef9226a1..25175dbe40c38d1e7d34f87b560c89a0e544bd27 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -92,7 +92,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index e30e025e296290ce0ad2eeea610d734d7544401c..1cee3e84b5aa7d6c5b6664796c4609e41c9bb7ab 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -90,7 +90,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index f96bea190195c4d71f4cf7f4ef5daf9c8a33aa91..7eda72597acdb90ecf930e4785d070cfacc7b345 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -59,7 +59,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index c4599e2520b9a99d2c3256fcdbb69ab18f378d18..f0c65ef45fdea953c4669ef79b2b2121a6d01ef8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -122,7 +122,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c3d1c90195dd8576cd9397ae4820b16503d2c7a5..1d8671ce4945c10aadf6cddf10da36ff37f18a03 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -94,7 +94,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 899eabfc22b0ea98507b701af8669c4d755d9db8..bd02db19d75213e76be06f284eb3030921941a85 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -92,7 +92,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index dc89b93e38be2cca673a7beeab2e6ff9ba1ccf83..62f57c8f3d10f17a663a2991a536ddeea2bde9b2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -91,7 +91,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 7d95c8e62a5eb916cd3d89918a436722b312370a..743763123374c1a1de6b975e154300737b6f2125 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -122,7 +122,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 44d8bec650bf1df8fcff7f261909cf5146391e12..9414b4f645c0f2eea359c8b857bdc86eb89da2da 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -30,7 +30,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='egl-headless'/>
   <flag name='memory-backend-memfd'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f9e4031b14691a1440ada3bff3d944da1b937675..27335beb967fa8d477a064d7ffb204fb33fba9aa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -121,7 +121,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index d5f66fcbd84d38bb099e3b6c2b89892cb5ae65c2..0a4a746c70697423958a1866fc8cf8c42d34013f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -93,7 +93,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index dd8f93e4cd0c1d6c774dbc870165f9c2cc3b5b49..5f67489600046ab726f5a233b81eef3b01fc70a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -90,7 +90,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index f82171b523c72413d468facbd985ab396f3adac6..64c0d6a51bc9ccb3dea6b659a5d90c7dd19ce38a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -89,7 +89,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 1d9ccea5202d17d37727d55b709812d095447882..7f0b971e77aa950a8bca6a01638767003122cb15 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -57,7 +57,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index b8bc71ff69100df2dee32d0674d5cbded714acc2..7369c2e1b2275b6a1424b2d7dfd4dcd7decf2293 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -121,7 +121,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 37abd13332755f32bfcb9613f3b79a6f737e2ac0..466832fde8ac10befc722f40a0f9260d8c4b9291 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -94,7 +94,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index c946be426866039375e3229ffeaf170d8e34fc5a..fefa817b9dcd29b143c592b2ea9e4623dbdc0f90 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -57,7 +57,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 066e52697f1358facfd51e7ee79b8f1f41305b8c..e9c6f9a3c653cdfe6065ca7f494b0ed5afa78146 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -120,7 +120,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 513817c15c5570a825f883ce97dec24428bae7c4..7e6a3616c9086433aa5f0372bfb87669f5260508 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -119,7 +119,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 249bfcea5456103b8e7ccea24f608e34894aad40..a547b935461a97f8511d367bc82eb34b3397d463 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -101,7 +101,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 8626b28acb715e058297101e3fc1eb84436734c3..9e39eaea5fe646f05241e5e2690a0fb16ab1c525 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -90,7 +90,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index a3b66b344f216881d2f956be21d7f4698d22d28d..0ed9738f2c12943a01d79159b6105264856ad4fe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -119,7 +119,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 965e2da7947fbf833c8ee344948023dcf5099185..58426f96fa95bde22cb854eae6ca77a5c7f53327 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -101,7 +101,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 2a4cf7b10096b7570a19c6cec182f7ad0d56da0a..3ba6d550aa8b0d32ed4c53514967104df7a5f23d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -96,7 +96,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7fb947b4267e981ce48e3cdee4bfbe971127bcf2..2ab4198e5894c493a38151b96cdbf922858a3b3f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -119,7 +119,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
index 85ac3b90d39e1aa2ff7f884f3cfa844f7ab6a40d..cfc56d42d3f925500675a064ff0c278909a06422 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml
@@ -95,7 +95,6 @@
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 434e148eebfad3aeb8f00bec237a00fa33eb6ea3..1afbe830d0efbb5ffcc8af5da4e9a35c270396b2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -119,7 +119,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
index a486c390cbc6de10d22c4ca2f6e295b080560183..febb341d4557da18d2b4245bdab2183251460702 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml
@@ -119,7 +119,6 @@
   <flag name='tpm-crb'/>
   <flag name='pr-manager-helper'/>
   <flag name='qom-list-properties'/>
-  <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
   <flag name='vmgenid'/>