| Message ID | 1456443528-13901-18-git-send-email-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Eric Blake <eblake@redhat.com> writes: > Now that the generator supports it, we might as well use an > anonymous base rather than breaking out a single-use > SchemaInfoBase structure. > > Oddly enough, this change does not affect the resulting > introspection output (because we already inline the members of > a base type into an object, and had no independent use of the > base type reachable from a command). Design vindicated :) > Signed-off-by: Eric Blake <eblake@redhat.com> Patch looks good.
diff --git a/qapi/introspect.json b/qapi/introspect.json index 9e9369e..3fd81fb 100644 --- a/qapi/introspect.json +++ b/qapi/introspect.json @@ -75,16 +75,6 @@ 'command', 'event' ] } ## -# @SchemaInfoBase -# -# Members common to any @SchemaInfo. -# -# Since: 2.5 -## -{ 'struct': 'SchemaInfoBase', - 'data': { 'name': 'str', 'meta-type': 'SchemaMetaType' } } - -## # @SchemaInfo # # @name: the entity's name, inherited from @base. @@ -103,7 +93,7 @@ # Since: 2.5 ## { 'union': 'SchemaInfo', - 'base': 'SchemaInfoBase', + 'base': { 'name': 'str', 'meta-type': 'SchemaMetaType' }, 'discriminator': 'meta-type', 'data': { 'builtin': 'SchemaInfoBuiltin',
Now that the generator supports it, we might as well use an anonymous base rather than breaking out a single-use SchemaInfoBase structure. Oddly enough, this change does not affect the resulting introspection output (because we already inline the members of a base type into an object, and had no independent use of the base type reachable from a command). Signed-off-by: Eric Blake <eblake@redhat.com> --- v2: no change v1: no change Previously posted as part of qapi cleanup subset F: v6: new patch --- qapi/introspect.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)