Commit b9c4b48d authored by Amos Kong's avatar Amos Kong Committed by Luiz Capitulino
Browse files

qapi: generate list struct and visit_list for enum 



Currently, if we define an 'enum' and use it in one command's
data, list struct for enum could not be generated, but it's
used in qmp function.

For example: KeyCodesList could not be generated.
>>> qapi-schema.json:
{ 'enum': 'KeyCodes',
  'data': [ 'shift', 'alt' ... ] }
{ 'command': 'sendkey',
  'data': { 'keys': ['KeyCodes'], '*hold-time': 'int' } }

>>> qmp-command.h:
void qmp_sendkey(KeyCodesList * keys, bool has_hold_time, int64_t
hold_time, Error **errp);

This patch lets qapi generate list struct and visit_list for enum.

Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 2ef20c15

scripts/qapi-types.py

+15 −1
Original line number Diff line number Diff line
@@ -28,6 +28,16 @@ typedef struct %(name)sList 
''',

                 name=name)



def generate_fwd_enum_struct(name, members):

    return mcgen('''

typedef struct %(name)sList

{

    %(name)s value;

    struct %(name)sList *next;

} %(name)sList;

''',

                 name=name)



def generate_struct(structname, fieldname, members):

    ret = mcgen('''

struct %(name)s
@@ -276,7 +286,8 @@ for expr in exprs: 
    if expr.has_key('type'):

        ret += generate_fwd_struct(expr['type'], expr['data'])

    elif expr.has_key('enum'):

        ret += generate_enum(expr['enum'], expr['data'])

        ret += generate_enum(expr['enum'], expr['data']) + "\n"

        ret += generate_fwd_enum_struct(expr['enum'], expr['data'])

        fdef.write(generate_enum_lookup(expr['enum'], expr['data']))

    elif expr.has_key('union'):

        ret += generate_fwd_struct(expr['union'], expr['data']) + "\n"
@@ -300,6 +311,9 @@ for expr in exprs: 
        fdef.write(generate_type_cleanup(expr['union'] + "List") + "\n")

        ret += generate_type_cleanup_decl(expr['union'])

        fdef.write(generate_type_cleanup(expr['union']) + "\n")

    elif expr.has_key('enum'):

        ret += generate_type_cleanup_decl(expr['enum'] + "List")

        fdef.write(generate_type_cleanup(expr['enum'] + "List") + "\n")

    else:

        continue

    fdecl.write(ret)

scripts/qapi-visit.py

+13 −1
Original line number Diff line number Diff line
@@ -217,6 +217,16 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, 


    return ret



def generate_enum_declaration(name, members, genlist=True):

    ret = ""

    if genlist:

        ret += mcgen('''

void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp);

''',

                     name=name)



    return ret



def generate_decl_enum(name, members, genlist=True):

    return mcgen('''
@@ -335,10 +345,12 @@ for expr in exprs: 
        ret += generate_declaration(expr['union'], expr['data'])

        fdecl.write(ret)

    elif expr.has_key('enum'):

        ret = generate_visit_enum(expr['enum'], expr['data'])

        ret = generate_visit_list(expr['enum'], expr['data'])

        ret += generate_visit_enum(expr['enum'], expr['data'])

        fdef.write(ret)



        ret = generate_decl_enum(expr['enum'], expr['data'])

        ret += generate_enum_declaration(expr['enum'], expr['data'])

        fdecl.write(ret)



fdecl.write('''