]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI
authorPeter Krempa <pkrempa@redhat.com>
Tue, 5 Sep 2023 13:37:50 +0000 (15:37 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 6 Sep 2023 12:09:43 +0000 (14:09 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
36 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml

index c1aca27d64f92f49ad7927d7f6a8d1a54e3d7267..630be618bf31dbcb9737255c39c68195e788d685 100644 (file)
@@ -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[] = {
index 612ed03c1fe8b323ffc20495e00e135cf85f44be..afc28620dd517b2b4c048b07cb4deee5f09db0db 100644 (file)
@@ -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 */
index f4f52fc1af5f780faeafd63ff7d39f22fab0fc28..72e6b614cf2596b6e836256001f3c3fbf2012966 100644 (file)
@@ -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'/>
index baa05be2fb26fc88d70c80e7c45314fc981778e0..9eff51672f1f90bfdcc17c57d98571537f14e884 100644 (file)
@@ -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'/>
index 4f7c98377d8a14559de36e20ed9aa67f18385dcd..20d458e55d572dfca7a5b14a8525756c53e1c37d 100644 (file)
@@ -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'/>
index 87d4fc6308c27bec3e5bd762d960951c81f9b119..28ccaa1271836ae8dd55505a4e85ec5013d5d809 100644 (file)
   <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'/>
index 0b9eabd3da9a3be143b90b6d34cafc9aae665c54..9d90e2534330b06cc1cc715c86157a68318b5423 100644 (file)
@@ -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'/>
index 481519c7629b2c3edb57214c3c096e18c4394fab..3e244da67e880188d0c08d130d5eb159b8fd5578 100644 (file)
@@ -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'/>
index 60384517a1f6e7389bd6d7004093f09ab9937aed..a1393e843db9c07bc9e280568093f4ddc715223d 100644 (file)
@@ -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'/>
index bd506fc3b30de3e027a3c468a27ff25e269af214..d40f771e77d61ce289bee3360e29f689b5abdd75 100644 (file)
   <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'/>
index 96ea86232350f020c00f3a7db6fdd4226994766b..e26f946a63feaa9d77548eee0ec06d4449274223 100644 (file)
   <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'/>
index d0c75c2bb9addac0bb7fea772a2c6a023e7eee08..46666a783ff5661fcc6addd81a7495dc6c1cf38a 100644 (file)
@@ -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'/>
index d86dab448284c39353873f26b651d4377bb3e42b..0496d3f0d6233e1a57084319f1a446f34605529f 100644 (file)
@@ -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'/>
index f57dc02b1367ce68ae5149bbc9f308a5eba2738a..edd562898ef21e2dbc684f68cfd023e03def2759 100644 (file)
@@ -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'/>
index d44ca2a121b79ecaf86b93c2afa1ebef39e67aef..0a18f55960b0cb8e3050046cb2b8bfe8c9a43950 100644 (file)
@@ -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'/>
index 7761b43708e46d5127cd4e5b4a369d466584e6db..387fa3c8c2eb6998685cbf35f61bd23bef90aa09 100644 (file)
   <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'/>
index 5f2e6c2e5ba6c017955e590d237d80bc2bd9d70c..6b7c40fb541c258a635d81c3b9c194495d1ef2e3 100644 (file)
@@ -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'/>
index 19f23f22f15d0496d3513ca2c0f5b018bbbd13c2..483962c83b2695d2ec50a529c93c98d6794b530f 100644 (file)
@@ -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'/>
index 237268cb69ac349e1213fc8015ba3f3d247b101c..daf47aa4b5c6da42dc3871a815d4fb255ceabfab 100644 (file)
   <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'/>
index d7fd5742dfe1cff337f7d5acb7af18961fc6a410..28f3a94617b4d4f61094d954c91e5f7c67f43202 100644 (file)
   <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'/>
index 5cfce5eaa9d3ad08797e3e21d6099bb1aaf0da14..3a16a54ca7b51291d040e8253a1c90259f7bb5e2 100644 (file)
@@ -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'/>
index b18d0509c290e2ab97366ca43dc463efa7996d42..fe1bffd49124e64e7395c153fa27655c53fbe4a1 100644 (file)
@@ -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'/>
index da548c8beb3fd1f6168b32d1713e2d64bd8f54dd..3f021441ed169ace9187e44917fd59b1dcf1e8d4 100644 (file)
   <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'/>
index 9a340e2566ab50da5499a7ba9157b01361e4c40f..45131f0b7f8fc86b46e1972a367b0fb77315e030 100644 (file)
@@ -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'/>
index f662cefb424e29da5b04c20acaac17dcbef61e6e..bbdd01b55a46d1d8f18458e80d911b4c4df409ac 100644 (file)
@@ -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'/>
index 6f29b29632a48ce791b7421254e7cdb708522dc6..047a867766f78b35658fa270a2b928e169d70d20 100644 (file)
@@ -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'/>
index d4b9c16a52eadb5eb9113ddd3417dfe826e1fbc2..25d97253911fea38a200e4f0a3104d2fbbcdd38b 100644 (file)
   <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'/>
index 67d9b23e79e043e2b393c441859ac43270bf80dc..4315241d1d460ebaeacbe075a3b4f01a8e711268 100644 (file)
@@ -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'/>
index 088c417f4dd331bb74abadb416841096d83e7f21..bd84750dc5c7a22b4b404df17ea40f9f01f2df48 100644 (file)
   <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'/>
index e5df1832b7f8dc76d24f9e5f95240bf953ee7124..a1fc44141270e2af9938d4335ee13fc51ce8c035 100644 (file)
@@ -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'/>
index d25f0c50b349f3d1535baac14cad5fc018b580a2..06a01a2c4cca4b08d982e2d7a72b24b4fc4eaa9b 100644 (file)
   <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'/>
index b29c52a6434ca61acf6f1f131a9511857e8383f2..8ac1529c300383930d4cf28f0497d5a92188b97d 100644 (file)
   <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'/>
index 4aeb210ca758c44756c8104b6294bb1bc267e6b4..31300d3d31ce910cffb01ea8d2cf698b065d09d8 100644 (file)
@@ -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'/>
index 20625eee00095855839e5bf6eed67547327d04a2..c2fa8eb02840685a6bbeb1aa9656b6daca3d4c9d 100644 (file)
   <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'/>
index a7519021e2e17a7948a122bdaa7a75164243d544..427ee9d5c7b7f2d8ee0412d319b9653a16be3c0f 100644 (file)
@@ -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'/>
index a107d2c8dddb471ad0b0107089355ba5c0584bd0..6f8c5a57b7a0f0a207b874d5073cabe2efe23cd7 100644 (file)
   <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'/>