From c9f3f578cd013858970b8928452a89c404dba8f5 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 5 Sep 2023 15:37:50 +0200
Subject: [PATCH] qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_capabilities.c                          | 3 +--
 src/qemu/qemu_capabilities.h                          | 2 +-
 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_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+hvf.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_ppc.xml         | 1 -
 tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml      | 1 -
 tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml     | 1 -
 tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml      | 1 -
 tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml       | 1 -
 tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml      | 1 -
 36 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c1aca27d64..630be618bf 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -503,7 +503,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "machine.pseries.cap-htm", /* X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */
               "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */
               "egl-headless", /* QEMU_CAPS_EGL_HEADLESS */
-              "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */
+              "vfio-pci.display", /* X_QEMU_CAPS_VFIO_PCI_DISPLAY */
               "blockdev", /* X_QEMU_CAPS_BLOCKDEV */
 
               /* 315 */
@@ -1445,7 +1445,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = {
-    { "display", QEMU_CAPS_VFIO_PCI_DISPLAY, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 612ed03c1f..afc28620dd 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -482,7 +482,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
     X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
     QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
-    QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
+    X_QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
     X_QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */
 
     /* 315 */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index f4f52fc1af..72e6b614cf 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -77,7 +77,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index baa05be2fb..9eff51672f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -78,7 +78,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index 4f7c98377d..20d458e55d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -46,7 +46,6 @@
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 87d4fc6308..28ccaa1271 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index 0b9eabd3da..9d90e25343 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -80,7 +80,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 481519c762..3e244da67e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -81,7 +81,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index 60384517a1..a1393e843d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -79,7 +79,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index bd506fc3b3..d40f771e77 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index 96ea862323..e26f946a63 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -106,7 +106,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index d0c75c2bb9..46666a783f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -79,7 +79,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index d86dab4482..0496d3f0d6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -79,7 +79,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index f57dc02b13..edd562898e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -77,7 +77,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index d44ca2a121..0a18f55960 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -44,7 +44,6 @@
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 7761b43708..387fa3c8c2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -106,7 +106,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index 5f2e6c2e5b..6b7c40fb54 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -80,7 +80,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index 19f23f22f1..483962c83b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -44,7 +44,6 @@
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 237268cb69..daf47aa4b5 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -106,7 +106,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='sev-guest'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index d7fd5742df..28f3a94617 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 5cfce5eaa9..3a16a54ca7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -87,7 +87,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index b18d0509c2..fe1bffd491 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -76,7 +76,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='nvdimm.unarmed'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index da548c8beb..3f021441ed 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index 9a340e2566..45131f0b7f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -86,7 +86,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index f662cefb42..bbdd01b55a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -87,7 +87,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 6f29b29632..047a867766 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -83,7 +83,6 @@
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index d4b9c16a52..25d9725391 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 67d9b23e79..4315241d1d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -81,7 +81,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='memory-backend-file.pmem'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 088c417f4d..bd84750dc5 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index e5df1832b7..a1fc441412 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -76,7 +76,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index d25f0c50b3..06a01a2c4c 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -103,7 +103,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index b29c52a643..8ac1529c30 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 4aeb210ca7..31300d3d31 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -70,7 +70,6 @@
   <flag name='hda-output'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='memory-backend-file.pmem'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 20625eee00..c2fa8eb028 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index a7519021e2..427ee9d5c7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -41,7 +41,6 @@
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index a107d2c8dd..6f8c5a57b7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -104,7 +104,6 @@
   <flag name='mch'/>
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
-  <flag name='vfio-pci.display'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='egl-headless.rendernode'/>