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>
2024-07-11 12:25:52 +00:00 · 2022-11-03 16:21:54 +01:00 · 2022-11-03 16:21:54 +01:00 · 881cf3c4f1
commit 881cf3c4f1
parent 8c0d43803b
29 changed files with 0 additions and 29 deletions
--- 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
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>