[PATCH-for-11.0] qapi: Remove deprecated SchemaInfoEnumMember::values field

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

SchemaInfoEnumMember::values field has been deprecated for
more than 5 years (see commit 75ecee72625 "qapi: Enable enum
member introspection to show more than name"), it should be
safe enough to remove.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 docs/about/deprecated.rst       |  6 ------
 docs/about/removed-features.rst |  7 +++++++
 qapi/introspect.json            | 12 +-----------
 scripts/qapi/introspect.py      |  3 +--
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index a6d6a713265..afb0d383c27 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -101,12 +101,6 @@ Use the more generic commands ``block-export-add`` and ``block-export-del``
 instead.  As part of this deprecation, where ``nbd-server-add`` used a
 single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``.
 
-``query-qmp-schema`` return value member ``values`` (since 6.2)
-'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-Member ``values`` in return value elements with meta-type ``enum`` is
-deprecated.  Use ``members`` instead.
-
 ``drive-backup`` (since 6.2)
 ''''''''''''''''''''''''''''
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index e75db084108..9eb4ef67ff4 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -787,6 +787,13 @@ $VM,debug-threads=on`` instead.
 
 This argument has always been ignored.
 
+``query-qmp-schema`` return value member ``values`` (removed in 11.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Member ``values`` in return value elements with meta-type ``enum`` has
+been replaced by ``members`` instead.
+
+
 QEMU Machine Protocol (QMP) events
 ----------------------------------
 
diff --git a/qapi/introspect.json b/qapi/introspect.json
index c8432c8ed8e..71b10baabaf 100644
--- a/qapi/introspect.json
+++ b/qapi/introspect.json
@@ -159,22 +159,12 @@
 # @members: the enum type's members, in no particular order.
 #     (since 6.2)
 #
-# @values: the enumeration type's member names, in no particular
-#     order.  Redundant with @members.  Just for backward
-#     compatibility.
-#
-# Features:
-#
-# @deprecated: Member @values is deprecated.  Use @members instead.
-#
 # Values of this type are JSON string on the wire.
 #
 # Since: 2.5
 ##
 { 'struct': 'SchemaInfoEnum',
-  'data': { 'members': [ 'SchemaInfoEnumMember' ],
-            'values': { 'type': [ 'str' ],
-                        'features': [ 'deprecated' ] } } }
+  'data': { 'members': [ 'SchemaInfoEnumMember' ] } }
 
 ##
 # @SchemaInfoEnumMember:
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 7e28de2279a..daeb3d77b23 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -318,8 +318,7 @@ def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
                         prefix: Optional[str]) -> None:
         self._gen_tree(
             name, 'enum',
-            {'members': [self._gen_enum_member(m) for m in members],
-             'values': [Annotated(m.name, m.ifcond) for m in members]},
+            {'members': [self._gen_enum_member(m) for m in members]},
             ifcond, features
         )
 
-- 
2.53.0