[libvirt PATCH 5/6] qemu: retire QEMU_CAPS_CCW_CSSID_UNRESTRICTED

[Ján Tomko]

Now that it is no longer used, stop probing for it.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_capabilities.c                    | 3 +--
 src/qemu/qemu_capabilities.h                    | 2 +-
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d254f38f92..699111a431 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -480,7 +480,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 295 */
               "virtual-css-bridge", /* QEMU_CAPS_CCW */
-              "virtual-css-bridge.cssid-unrestricted", /* QEMU_CAPS_CCW_CSSID_UNRESTRICTED */
+              "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED */
               "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */
               "sdl-gl", /* X_QEMU_CAPS_SDL_GL */
               "screendump_device", /* QEMU_CAPS_SCREENDUMP_DEVICE */
@@ -1532,7 +1532,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = {
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSSBridge[] = {
-    { "cssid-unrestricted", QEMU_CAPS_CCW_CSSID_UNRESTRICTED, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 9cd00ba812..263ef850c7 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -459,7 +459,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 295 */
     QEMU_CAPS_CCW, /* -device virtual-css-bridge */
-    QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
+    X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
     QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */
     X_QEMU_CAPS_SDL_GL, /* -sdl gl */
     QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 7bf0427077..4bb6d1fc5e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -63,7 +63,6 @@
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
   <flag name='virtual-css-bridge'/>
-  <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <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 0523c8d22f..40eb1550af 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -61,7 +61,6 @@
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
   <flag name='virtual-css-bridge'/>
-  <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <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 4f009def58..2628ab1409 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -61,7 +61,6 @@
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
   <flag name='virtual-css-bridge'/>
-  <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
   <flag name='vhost-vsock'/>
-- 
2.37.3