Commit cb17f79e authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Fix generation of 'size' builtin type 



We were missing the 'size' builtin type (which means that QAPI using
[ 'size' ] would fail to compile).

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent b52c4b9c

scripts/qapi.py

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ builtin_types = { 
    'uint16':   'QTYPE_QINT',

    'uint32':   'QTYPE_QINT',

    'uint64':   'QTYPE_QINT',

    'size':     'QTYPE_QINT',

}



def error_path(parent):

tests/qapi-schema/qapi-schema-test.json

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ 
            'u64': ['uint64'],

            'number': ['number'],

            'boolean': ['bool'],

            'string': ['str'] } }

            'string': ['str'],

            'sizes': ['size'] } }



# testing commands

{ 'command': 'user_def_cmd', 'data': {} }

tests/qapi-schema/qapi-schema-test.out

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 OrderedDict([('union', 'UserDefFlatUnion'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefA'), ('value2', 'UserDefB'), ('value3', 'UserDefB')]))]),

 OrderedDict([('union', 'UserDefFlatUnion2'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefC'), ('value2', 'UserDefB'), ('value3', 'UserDefA')]))]),

 OrderedDict([('union', 'UserDefAnonUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('uda', 'UserDefA'), ('s', 'str'), ('i', 'int')]))]),

 OrderedDict([('union', 'UserDefNativeListUnion'), ('data', OrderedDict([('integer', ['int']), ('s8', ['int8']), ('s16', ['int16']), ('s32', ['int32']), ('s64', ['int64']), ('u8', ['uint8']), ('u16', ['uint16']), ('u32', ['uint32']), ('u64', ['uint64']), ('number', ['number']), ('boolean', ['bool']), ('string', ['str'])]))]),

 OrderedDict([('union', 'UserDefNativeListUnion'), ('data', OrderedDict([('integer', ['int']), ('s8', ['int8']), ('s16', ['int16']), ('s32', ['int32']), ('s64', ['int64']), ('u8', ['uint8']), ('u16', ['uint16']), ('u32', ['uint32']), ('u64', ['uint64']), ('number', ['number']), ('boolean', ['bool']), ('string', ['str']), ('sizes', ['size'])]))]),

 OrderedDict([('command', 'user_def_cmd'), ('data', OrderedDict())]),

 OrderedDict([('command', 'user_def_cmd1'), ('data', OrderedDict([('ud1a', 'UserDefOne')]))]),

 OrderedDict([('command', 'user_def_cmd2'), ('data', OrderedDict([('ud1a', 'UserDefOne'), ('*ud1b', 'UserDefOne')])), ('returns', 'UserDefTwo')]),