qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-07-05 01:22:38 +00:00 · 2023-09-05 15:37:50 +02:00 · 2023-09-05 15:37:50 +02:00 · c9f3f578cd
commit c9f3f578cd
parent cbb3adde61
36 changed files with 2 additions and 37 deletions
--- 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[] = {
--- 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 */
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>