diff options
| author | Markus Armbruster <armbru@redhat.com> | 2024-02-05 08:47:08 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2024-02-12 10:04:32 +0100 |
| commit | 8bf69544b5e8142a4b7397bc1235eb2c42d1b29d (patch) | |
| tree | 199962559f8b577fc7084f787cd0dc0b0b36b061 /qapi | |
| parent | 4edb196e209e21c4bc5e10f5873fded1d4565f94 (diff) | |
qapi: Move @String out of common.json to discourage reuse
Use of String is problematic, because it results in awkward interface
documentation. The previous commit cleaned up one instance.
Move String out of common.json next to its remaining users in net.json
to discourage reuse elsewhere.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240205074709.3613229-15-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/common.json | 11 | ||||
| -rw-r--r-- | qapi/net.json | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/qapi/common.json b/qapi/common.json index 6fed9cde1a..f1bb841951 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -52,17 +52,6 @@ 'data': [ 'on', 'off', 'split' ] } ## -# @String: -# -# A fat type wrapping 'str', to be embedded in lists. -# -# Since: 1.2 -## -{ 'struct': 'String', - 'data': { - 'str': 'str' } } - -## # @StrOrNull: # # This is a string value or the explicit lack of a string (null diff --git a/qapi/net.json b/qapi/net.json index 68493d6ac9..0a993e1a3d 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -6,7 +6,6 @@ # = Net devices ## -{ 'include': 'common.json' } { 'include': 'sockets.json' } ## @@ -106,6 +105,17 @@ '*vectors': 'uint32' } } ## +# @String: +# +# A fat type wrapping 'str', to be embedded in lists. +# +# Since: 1.2 +## +{ 'struct': 'String', + 'data': { + 'str': 'str' } } + +## # @NetdevUserOptions: # # Use the user mode network stack which requires no administrator |