[PATCH 2/2] qapi: correctly mark 'ignore-unavailable' deprecated

["Daniel P. Berrangé" <berrange@redhat.com>]

Follow the proper QAPI syntax for deprecations and mention it
in the documentation.

Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 docs/about/deprecated.rst |  8 ++++++++
 qapi/trace.json           | 10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 0891bbc44de..a39feb23f5b 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -182,6 +182,14 @@ execution.  This special treatment of ``"no"`` is deprecated.  Use an
 empty string instead.  In a future version, ``"no"`` will be treated as
 a plain file name.
 
+``ignore-unavailable`` in ``trace-event-set-state`` (since 11.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Trace events are now unconditionally built-in to all QEMU builds,
+so the concept of an 'unavailable' trace event no longer exists.
+The ``ignore-unavailable`` parameter in ``trace-event-set-state``
+thus has no effect and should no longer be used.
+
 Human Machine Protocol (HMP) commands
 -------------------------------------
 
diff --git a/qapi/trace.json b/qapi/trace.json
index 8533e378977..5792a436115 100644
--- a/qapi/trace.json
+++ b/qapi/trace.json
@@ -67,10 +67,14 @@
 # @enable: Whether to enable tracing.
 #
 # @ignore-unavailable: Do not match unavailable events with @name.
-#      Deprecated: since 11.2
 #
 # Since: 2.2
 #
+# Features:
+#
+# @deprecated: @ignore-unavailable no longer has any effect
+#    (since 11.2)
+#
 # .. qmp-example::
 #
 #     -> { "execute": "trace-event-set-state",
@@ -78,4 +82,6 @@
 #     <- { "return": {} }
 ##
 { 'command': 'trace-event-set-state',
-  'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool' } }
+  'data': {'name': 'str', 'enable': 'bool',
+           '*ignore-unavailable': { 'type': 'bool',
+                                    'features': ['deprecated'] } } }
-- 
2.56.1