diff mbox series

[7/7] find untagged sections WIP

Message ID 20240506110254.3965097-14-armbru@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,1/7] qapi: New QAPISchemaBranches, QAPISchemaAlternatives | expand

Commit Message

Markus Armbruster May 6, 2024, 11:02 a.m. UTC
---
 qapi/block-core.json           | 1 +
 qapi/introspect.json           | 4 ++++
 qapi/machine-target.json       | 2 ++
 qapi/migration.json            | 3 +++
 qapi/net.json                  | 2 ++
 qapi/qom.json                  | 1 +
 qapi/ui.json                   | 1 +
 qga/qapi-schema.json           | 2 ++
 scripts/qapi/parser.py         | 1 +
 tests/qapi-schema/doc-good.out | 1 +
 10 files changed, 18 insertions(+)

Comments

Markus Armbruster May 6, 2024, 12:47 p.m. UTC | #1
Sent by accident, please ignore.
diff mbox series

Patch

diff --git a/qapi/block-core.json b/qapi/block-core.json
index fab1a45365..1c43d3d2bb 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3289,6 +3289,7 @@ 
 #
 # @namespace: namespace number of the device, starting from 1.
 #
+# @@@ untagged
 # Note that the PCI @device must have been unbound from any host
 # kernel driver before instructing QEMU to add the blockdev.
 #
diff --git a/qapi/introspect.json b/qapi/introspect.json
index b041b02ba8..1747562a41 100644
--- a/qapi/introspect.json
+++ b/qapi/introspect.json
@@ -149,6 +149,7 @@ 
 #
 # @deprecated: Member @values is deprecated.  Use @members instead.
 #
+# @@@ untagged
 # Values of this type are JSON string on the wire.
 #
 # Since: 2.5
@@ -180,6 +181,7 @@ 
 #
 # @element-type: the array type's element type.
 #
+# @@@ untagged
 # Values of this type are JSON array on the wire.
 #
 # Since: 2.5
@@ -203,6 +205,7 @@ 
 #     The variants are in no particular order, and may even differ
 #     from the order of the values of the enum type of the @tag.
 #
+# @@@ untagged
 # Values of this type are JSON object on the wire.
 #
 # Since: 2.5
@@ -261,6 +264,7 @@ 
 #     members' wire encoding is distinct, see
 #     :doc:`/devel/qapi-code-gen` section Alternate types.
 #
+# @@@ untagged
 # On the wire, this can be any of the members.
 #
 # Since: 2.5
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index 4ef7ef7b43..37ffd6409b 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -107,6 +107,7 @@ 
 # @responsible-properties: List of properties that led to the
 #     comparison result not being identical.
 #
+# @@@ untagged
 # @responsible-properties is a list of QOM property names that led to
 # both CPUs not being detected as identical.  For identical models,
 # this list is empty.  If a QOM property is read-only, that means
@@ -342,6 +343,7 @@ 
 #     removed in in some future version of QEMU according to the QEMU
 #     deprecation policy.  (since 5.2)
 #
+# @@@ untagged
 # @unavailable-features is a list of QOM property names that represent
 # CPU model attributes that prevent the CPU from running.  If the QOM
 # property is read-only, that means there's no known way to make the
diff --git a/qapi/migration.json b/qapi/migration.json
index e22645253c..97a727c41a 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -2427,6 +2427,7 @@ 
 #
 # @devices: list of block device node names to save a snapshot to
 #
+# @@@ untagged
 # Applications should not assume that the snapshot save is complete
 # when this command returns.  The job commands / events must be used
 # to determine completion and to fetch details of any errors that
@@ -2499,6 +2500,7 @@ 
 #
 # @devices: list of block device node names to load a snapshot from
 #
+# @@@ untagged
 # Applications should not assume that the snapshot load is complete
 # when this command returns.  The job commands / events must be used
 # to determine completion and to fetch details of any errors that
@@ -2567,6 +2569,7 @@ 
 #
 # @devices: list of block device node names to delete a snapshot from
 #
+# @@@ untagged
 # Applications should not assume that the snapshot delete is complete
 # when this command returns.  The job commands / events must be used
 # to determine completion and to fetch details of any errors that
diff --git a/qapi/net.json b/qapi/net.json
index 0f5a259475..da21c02fa2 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -650,6 +650,7 @@ 
 #     attempt a reconnect after the given number of seconds.  Setting
 #     this to zero disables this function.  (default: 0) (since 8.0)
 #
+# @@@ untagged
 # Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
 #
 # Since: 7.2
@@ -669,6 +670,7 @@ 
 #
 # @local: local address
 #
+# @@@ untagged
 # Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
 #
 # If remote address is present and it's a multicast address, local
diff --git a/qapi/qom.json b/qapi/qom.json
index d1dc216474..237711cd59 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -547,6 +547,7 @@ 
 #     algorithm detects it is spending too long polling without
 #     encountering events.  0 selects a default behaviour (default: 0)
 #
+# @@@ untagged
 # The @aio-max-batch option is available since 6.1.
 #
 # Since: 2.0
diff --git a/qapi/ui.json b/qapi/ui.json
index 2b7f0b8401..b2c3f143dc 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -934,6 +934,7 @@ 
 #
 # @f24: since 8.0
 #
+# @@@ untagged
 # 'sysrq' was mistakenly added to hack around the fact that the ps2
 # driver was not generating correct scancodes sequences when
 # 'alt+print' was pressed.  This flaw is now fixed and the 'sysrq' key
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index fe41670ed2..17cdb52f83 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -207,6 +207,7 @@ 
 #
 # @mode: "halt", "powerdown" (default), or "reboot"
 #
+# @@@ untagged
 # This command does NOT return a response on success.  Success
 # condition is indicated by the VM exiting with a zero exit status or,
 # when running with --no-shutdown, by issuing the query-status QMP
@@ -1050,6 +1051,7 @@ 
 #
 # @crypted: true if password is already crypt()d, false if raw
 #
+# @@@ untagged
 # If the @crypted flag is true, it is the caller's responsibility to
 # ensure the correct crypt() encryption scheme is used.  This command
 # does not attempt to interpret or report on the encryption scheme.
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index e8a482c37d..126acab38d 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -665,6 +665,7 @@  def ensure_untagged_section(self, info: QAPISourceInfo) -> None:
         section = self.Section(info)
         self.sections.append(section)
         self.all_sections.append(section)
+        section.append_line(f'### untagged {info.loc()}')
 
     def new_tagged_section(self, info: QAPISourceInfo, tag: str) -> None:
         section = self.Section(info, tag)
diff --git a/tests/qapi-schema/doc-good.out b/tests/qapi-schema/doc-good.out
index f2be711a2c..067e3d1135 100644
--- a/tests/qapi-schema/doc-good.out
+++ b/tests/qapi-schema/doc-good.out
@@ -112,6 +112,7 @@  Also _one_ {and only}
     feature=enum-member-feat
 a member feature
     section=None
+### untagged /work/armbru/qemu/bld/../tests/qapi-schema/doc-good.json:67
 @two is undocumented
 doc symbol=Base
     body=