Commit 0eee31cf108 (qapi/qom: add qapi-type to qom-list,
qom-list-properties, qom-list-get) had to make @qapi-type optional to
enable incremental conversion to QAPI-aware property registration.
This conversion is now complete: @qapi-type is always present.  Make
it mandatory.

Signed-off-by: Markus Armbruster <[email protected]>
---
 qapi/qom.json | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/qapi/qom.json b/qapi/qom.json
index 32a5926936..cc642c7ba9 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -36,8 +36,7 @@
 #        graph.
 #
 # @qapi-type: the name of the property's type as it appears in the
-#     output of ``query-qmp-schema``.  Absent if the type does not
-#     occur there.  (since 11.2)
+#     output of ``query-qmp-schema``.  (since 11.2)
 #
 # @description: if specified, the description of the property.
 #
@@ -52,7 +51,7 @@
 { 'struct': 'ObjectPropertyInfo',
   'data': { 'name': 'str',
             'type': 'str',
-            '*qapi-type': { 'type': 'str', 'features': [ 'unstable' ] },
+            'qapi-type': { 'type': 'str', 'features': [ 'unstable' ] },
             '*description': 'str',
             '*default-value': 'any' } }
 
@@ -65,8 +64,7 @@
 #     `ObjectPropertyInfo`.
 #
 # @qapi-type: the name of the property's type as it appears in the
-#     output of ``query-qmp-schema``.  Absent if the type does not
-#     occur there.  (since 11.2)
+#     output of ``query-qmp-schema``.  (since 11.2)
 #
 # @value: the value of the property.  Absent when the property cannot
 #     be read.
@@ -80,7 +78,7 @@
 { 'struct': 'ObjectPropertyValue',
   'data': { 'name': 'str',
             'type': 'str',
-            '*qapi-type': { 'type': 'str', 'features': [ 'unstable' ] },
+            'qapi-type': { 'type': 'str', 'features': [ 'unstable' ] },
             '*value': 'any' } }
 
 ##
-- 
2.55.0


Reply via email to