2011-07-19 21:50:41 +02:00
|
|
|
#
|
|
|
|
# QAPI visitor generator
|
|
|
|
#
|
|
|
|
# Copyright IBM, Corp. 2011
|
|
|
|
#
|
|
|
|
# Authors:
|
|
|
|
# Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
# Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
|
#
|
|
|
|
# This work is licensed under the terms of the GNU GPLv2.
|
|
|
|
# See the COPYING.LIB file in the top-level directory.
|
|
|
|
|
|
|
|
from ordereddict import OrderedDict
|
|
|
|
from qapi import *
|
|
|
|
import sys
|
|
|
|
import os
|
|
|
|
import getopt
|
|
|
|
import errno
|
|
|
|
|
2013-07-03 15:58:57 +02:00
|
|
|
def generate_visit_struct_fields(name, field_prefix, fn_prefix, members):
|
|
|
|
substructs = []
|
2013-07-02 16:18:35 +02:00
|
|
|
ret = ''
|
2013-07-03 15:58:57 +02:00
|
|
|
full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix)
|
|
|
|
|
|
|
|
for argname, argentry, optional, structured in parse_args(members):
|
|
|
|
if structured:
|
|
|
|
if not fn_prefix:
|
|
|
|
nested_fn_prefix = argname
|
|
|
|
else:
|
|
|
|
nested_fn_prefix = "%s_%s" % (fn_prefix, argname)
|
|
|
|
|
|
|
|
nested_field_prefix = "%s%s." % (field_prefix, argname)
|
|
|
|
ret += generate_visit_struct_fields(name, nested_field_prefix,
|
|
|
|
nested_fn_prefix, argentry)
|
|
|
|
|
|
|
|
ret += mcgen('''
|
|
|
|
|
|
|
|
static void visit_type_%(full_name)s_fields(Visitor *m, %(name)s ** obj, Error **errp)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
''',
|
|
|
|
name=name, full_name=full_name)
|
|
|
|
push_indent()
|
2012-07-17 16:17:04 +02:00
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
for argname, argentry, optional, structured in parse_args(members):
|
|
|
|
if optional:
|
|
|
|
ret += mcgen('''
|
2012-07-17 16:17:04 +02:00
|
|
|
visit_start_optional(m, obj ? &(*obj)->%(c_prefix)shas_%(c_name)s : NULL, "%(name)s", &err);
|
|
|
|
if (obj && (*obj)->%(prefix)shas_%(c_name)s) {
|
2011-07-19 21:50:41 +02:00
|
|
|
''',
|
|
|
|
c_prefix=c_var(field_prefix), prefix=field_prefix,
|
|
|
|
c_name=c_var(argname), name=argname)
|
|
|
|
push_indent()
|
|
|
|
|
|
|
|
if structured:
|
2013-07-03 15:58:57 +02:00
|
|
|
ret += generate_visit_struct_body(full_name, argname, argentry)
|
2011-07-19 21:50:41 +02:00
|
|
|
else:
|
|
|
|
ret += mcgen('''
|
2012-07-17 16:17:04 +02:00
|
|
|
visit_type_%(type)s(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s : NULL, "%(name)s", &err);
|
2011-07-19 21:50:41 +02:00
|
|
|
''',
|
|
|
|
c_prefix=c_var(field_prefix), prefix=field_prefix,
|
|
|
|
type=type_name(argentry), c_name=c_var(argname),
|
|
|
|
name=argname)
|
|
|
|
|
|
|
|
if optional:
|
|
|
|
pop_indent()
|
|
|
|
ret += mcgen('''
|
|
|
|
}
|
2012-07-17 16:17:04 +02:00
|
|
|
visit_end_optional(m, &err);
|
|
|
|
''')
|
|
|
|
|
2013-07-03 15:58:57 +02:00
|
|
|
pop_indent()
|
|
|
|
ret += mcgen('''
|
|
|
|
|
|
|
|
error_propagate(errp, err);
|
|
|
|
}
|
|
|
|
''')
|
2013-07-02 16:18:35 +02:00
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
|
|
def generate_visit_struct_body(field_prefix, name, members):
|
|
|
|
ret = mcgen('''
|
|
|
|
if (!error_is_set(errp)) {
|
|
|
|
''')
|
|
|
|
push_indent()
|
|
|
|
|
2013-07-03 15:58:57 +02:00
|
|
|
full_name = name if not field_prefix else "%s_%s" % (field_prefix, name)
|
|
|
|
|
2013-07-02 16:18:35 +02:00
|
|
|
if len(field_prefix):
|
|
|
|
ret += mcgen('''
|
|
|
|
Error **errp = &err; /* from outer scope */
|
|
|
|
Error *err = NULL;
|
|
|
|
visit_start_struct(m, NULL, "", "%(name)s", 0, &err);
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
else:
|
|
|
|
ret += mcgen('''
|
|
|
|
Error *err = NULL;
|
|
|
|
visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err);
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
2012-07-17 16:17:04 +02:00
|
|
|
ret += mcgen('''
|
2013-07-02 16:18:35 +02:00
|
|
|
if (!err) {
|
|
|
|
if (!obj || *obj) {
|
2013-07-03 15:58:57 +02:00
|
|
|
visit_type_%(name)s_fields(m, obj, &err);
|
|
|
|
error_propagate(errp, err);
|
|
|
|
err = NULL;
|
|
|
|
}
|
|
|
|
''',
|
|
|
|
name=full_name)
|
2012-07-17 16:17:04 +02:00
|
|
|
|
|
|
|
pop_indent()
|
|
|
|
ret += mcgen('''
|
|
|
|
/* Always call end_struct if start_struct succeeded. */
|
|
|
|
visit_end_struct(m, &err);
|
|
|
|
}
|
|
|
|
error_propagate(errp, err);
|
|
|
|
}
|
2011-07-19 21:50:41 +02:00
|
|
|
''')
|
|
|
|
return ret
|
|
|
|
|
|
|
|
def generate_visit_struct(name, members):
|
2013-07-03 15:58:57 +02:00
|
|
|
ret = generate_visit_struct_fields(name, "", "", members)
|
|
|
|
|
|
|
|
ret += mcgen('''
|
2011-07-19 21:50:41 +02:00
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
''',
|
|
|
|
name=name)
|
2012-07-17 16:17:04 +02:00
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
push_indent()
|
2012-07-17 16:17:04 +02:00
|
|
|
ret += generate_visit_struct_body("", name, members)
|
2011-07-19 21:50:41 +02:00
|
|
|
pop_indent()
|
|
|
|
|
|
|
|
ret += mcgen('''
|
|
|
|
}
|
|
|
|
''')
|
|
|
|
return ret
|
|
|
|
|
|
|
|
def generate_visit_list(name, members):
|
|
|
|
return mcgen('''
|
|
|
|
|
|
|
|
void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp)
|
|
|
|
{
|
2012-03-22 22:38:40 +01:00
|
|
|
GenericList *i, **prev = (GenericList **)obj;
|
2012-07-17 16:17:04 +02:00
|
|
|
Error *err = NULL;
|
2011-07-19 21:50:41 +02:00
|
|
|
|
2012-07-17 16:17:04 +02:00
|
|
|
if (!error_is_set(errp)) {
|
|
|
|
visit_start_list(m, name, &err);
|
|
|
|
if (!err) {
|
|
|
|
for (; (i = visit_next_list(m, prev, &err)) != NULL; prev = &i) {
|
|
|
|
%(name)sList *native_i = (%(name)sList *)i;
|
|
|
|
visit_type_%(name)s(m, &native_i->value, NULL, &err);
|
|
|
|
}
|
|
|
|
error_propagate(errp, err);
|
|
|
|
err = NULL;
|
|
|
|
|
|
|
|
/* Always call end_list if start_list succeeded. */
|
|
|
|
visit_end_list(m, &err);
|
|
|
|
}
|
|
|
|
error_propagate(errp, err);
|
2011-07-19 21:50:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
|
|
|
def generate_visit_enum(name, members):
|
|
|
|
return mcgen('''
|
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
visit_type_enum(m, (int *)obj, %(name)s_lookup, "%(name)s", name, errp);
|
|
|
|
}
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
2013-07-08 16:14:21 +02:00
|
|
|
def generate_visit_anon_union(name, members):
|
|
|
|
ret = mcgen('''
|
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
Error *err = NULL;
|
|
|
|
|
|
|
|
if (!error_is_set(errp)) {
|
|
|
|
visit_start_implicit_struct(m, (void**) obj, sizeof(%(name)s), &err);
|
|
|
|
visit_get_next_type(m, (int*) &(*obj)->kind, %(name)s_qtypes, name, &err);
|
|
|
|
switch ((*obj)->kind) {
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
|
|
|
for key in members:
|
|
|
|
assert (members[key] in builtin_types
|
|
|
|
or find_struct(members[key])
|
|
|
|
or find_union(members[key])), "Invalid anonymous union member"
|
|
|
|
|
|
|
|
ret += mcgen('''
|
|
|
|
case %(abbrev)s_KIND_%(enum)s:
|
|
|
|
visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, name, &err);
|
|
|
|
break;
|
|
|
|
''',
|
|
|
|
abbrev = de_camel_case(name).upper(),
|
|
|
|
enum = c_fun(de_camel_case(key),False).upper(),
|
|
|
|
c_type = type_name(members[key]),
|
|
|
|
c_name = c_fun(key))
|
|
|
|
|
|
|
|
ret += mcgen('''
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
error_propagate(errp, err);
|
|
|
|
err = NULL;
|
|
|
|
visit_end_implicit_struct(m, &err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
''')
|
|
|
|
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
2013-07-02 16:20:04 +02:00
|
|
|
def generate_visit_union(expr):
|
|
|
|
|
|
|
|
name = expr['union']
|
|
|
|
members = expr['data']
|
|
|
|
|
|
|
|
base = expr.get('base')
|
2013-07-03 15:58:57 +02:00
|
|
|
discriminator = expr.get('discriminator')
|
2013-07-02 16:20:04 +02:00
|
|
|
|
2013-07-08 16:14:21 +02:00
|
|
|
if discriminator == {}:
|
|
|
|
assert not base
|
|
|
|
return generate_visit_anon_union(name, members)
|
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
ret = generate_visit_enum('%sKind' % name, members.keys())
|
|
|
|
|
2013-07-03 15:58:57 +02:00
|
|
|
if base:
|
|
|
|
base_fields = find_struct(base)['data']
|
|
|
|
if discriminator:
|
|
|
|
base_fields = base_fields.copy()
|
|
|
|
del base_fields[discriminator]
|
|
|
|
ret += generate_visit_struct_fields(name, "", "", base_fields)
|
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
ret += mcgen('''
|
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp)
|
|
|
|
{
|
2012-03-06 18:55:56 +01:00
|
|
|
Error *err = NULL;
|
|
|
|
|
2012-07-17 16:17:04 +02:00
|
|
|
if (!error_is_set(errp)) {
|
|
|
|
visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err);
|
|
|
|
if (!err) {
|
2012-09-01 09:30:39 +02:00
|
|
|
if (obj && *obj) {
|
2011-07-19 21:50:41 +02:00
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
2013-07-02 16:20:04 +02:00
|
|
|
|
2012-07-17 16:17:04 +02:00
|
|
|
push_indent()
|
|
|
|
push_indent()
|
2013-07-02 16:20:04 +02:00
|
|
|
push_indent()
|
|
|
|
|
|
|
|
if base:
|
2013-07-03 15:58:57 +02:00
|
|
|
ret += mcgen('''
|
|
|
|
visit_type_%(name)s_fields(m, obj, &err);
|
|
|
|
''',
|
|
|
|
name=name)
|
2013-07-02 16:20:04 +02:00
|
|
|
|
|
|
|
pop_indent()
|
|
|
|
ret += mcgen('''
|
2013-07-03 15:58:57 +02:00
|
|
|
visit_type_%(name)sKind(m, &(*obj)->kind, "%(type)s", &err);
|
2013-07-02 16:20:04 +02:00
|
|
|
if (!err) {
|
|
|
|
switch ((*obj)->kind) {
|
|
|
|
''',
|
2013-07-03 15:58:57 +02:00
|
|
|
name=name, type="type" if not discriminator else discriminator)
|
2013-07-02 16:20:04 +02:00
|
|
|
|
2012-03-06 18:55:56 +01:00
|
|
|
for key in members:
|
2013-07-03 15:58:57 +02:00
|
|
|
if not discriminator:
|
|
|
|
fmt = 'visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, "data", &err);'
|
|
|
|
else:
|
|
|
|
fmt = '''visit_start_implicit_struct(m, (void**) &(*obj)->%(c_name)s, sizeof(%(c_type)s), &err);
|
|
|
|
if (!err) {
|
|
|
|
visit_type_%(c_type)s_fields(m, &(*obj)->%(c_name)s, &err);
|
|
|
|
error_propagate(errp, err);
|
|
|
|
err = NULL;
|
|
|
|
visit_end_implicit_struct(m, &err);
|
|
|
|
}'''
|
|
|
|
|
2012-03-06 18:55:56 +01:00
|
|
|
ret += mcgen('''
|
2012-07-17 16:17:04 +02:00
|
|
|
case %(abbrev)s_KIND_%(enum)s:
|
2013-07-03 15:58:57 +02:00
|
|
|
''' + fmt + '''
|
2012-07-17 16:17:04 +02:00
|
|
|
break;
|
2012-03-06 18:55:56 +01:00
|
|
|
''',
|
|
|
|
abbrev = de_camel_case(name).upper(),
|
2012-09-19 16:31:06 +02:00
|
|
|
enum = c_fun(de_camel_case(key),False).upper(),
|
2013-05-11 00:46:01 +02:00
|
|
|
c_type=type_name(members[key]),
|
2012-03-20 14:54:35 +01:00
|
|
|
c_name=c_fun(key))
|
2012-03-06 18:55:56 +01:00
|
|
|
|
|
|
|
ret += mcgen('''
|
2012-07-17 16:17:04 +02:00
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
error_propagate(errp, err);
|
|
|
|
err = NULL;
|
|
|
|
}
|
|
|
|
''')
|
|
|
|
pop_indent()
|
|
|
|
ret += mcgen('''
|
|
|
|
/* Always call end_struct if start_struct succeeded. */
|
|
|
|
visit_end_struct(m, &err);
|
2012-03-06 18:55:56 +01:00
|
|
|
}
|
2012-07-17 16:17:04 +02:00
|
|
|
error_propagate(errp, err);
|
|
|
|
}
|
|
|
|
''')
|
|
|
|
|
|
|
|
pop_indent();
|
|
|
|
ret += mcgen('''
|
2012-03-06 18:55:56 +01:00
|
|
|
}
|
|
|
|
''')
|
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
return ret
|
|
|
|
|
2013-05-11 00:46:02 +02:00
|
|
|
def generate_declaration(name, members, genlist=True, builtin_type=False):
|
|
|
|
ret = ""
|
|
|
|
if not builtin_type:
|
|
|
|
ret += mcgen('''
|
2011-07-19 21:50:41 +02:00
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp);
|
|
|
|
''',
|
2013-05-11 00:46:02 +02:00
|
|
|
name=name)
|
2011-07-19 21:50:41 +02:00
|
|
|
|
|
|
|
if genlist:
|
|
|
|
ret += mcgen('''
|
|
|
|
void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp);
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
|
|
|
return ret
|
|
|
|
|
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: Amos Kong <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
2012-08-31 04:56:23 +02:00
|
|
|
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
|
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
def generate_decl_enum(name, members, genlist=True):
|
|
|
|
return mcgen('''
|
|
|
|
|
|
|
|
void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp);
|
|
|
|
''',
|
|
|
|
name=name)
|
|
|
|
|
|
|
|
try:
|
2013-05-11 00:46:02 +02:00
|
|
|
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
|
|
|
|
["source", "header", "builtins", "prefix=",
|
|
|
|
"output-dir="])
|
2011-07-19 21:50:41 +02:00
|
|
|
except getopt.GetoptError, err:
|
|
|
|
print str(err)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
output_dir = ""
|
|
|
|
prefix = ""
|
|
|
|
c_file = 'qapi-visit.c'
|
|
|
|
h_file = 'qapi-visit.h'
|
|
|
|
|
2011-12-27 15:02:16 +01:00
|
|
|
do_c = False
|
|
|
|
do_h = False
|
2013-05-11 00:46:02 +02:00
|
|
|
do_builtins = False
|
2011-12-27 15:02:16 +01:00
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
for o, a in opts:
|
|
|
|
if o in ("-p", "--prefix"):
|
|
|
|
prefix = a
|
|
|
|
elif o in ("-o", "--output-dir"):
|
|
|
|
output_dir = a + "/"
|
2011-12-27 15:02:16 +01:00
|
|
|
elif o in ("-c", "--source"):
|
|
|
|
do_c = True
|
2011-12-28 11:26:58 +01:00
|
|
|
elif o in ("-h", "--header"):
|
|
|
|
do_h = True
|
2013-05-11 00:46:02 +02:00
|
|
|
elif o in ("-b", "--builtins"):
|
|
|
|
do_builtins = True
|
2011-12-27 15:02:16 +01:00
|
|
|
|
|
|
|
if not do_c and not do_h:
|
|
|
|
do_c = True
|
|
|
|
do_h = True
|
2011-07-19 21:50:41 +02:00
|
|
|
|
|
|
|
c_file = output_dir + prefix + c_file
|
|
|
|
h_file = output_dir + prefix + h_file
|
|
|
|
|
|
|
|
try:
|
|
|
|
os.makedirs(output_dir)
|
|
|
|
except os.error, e:
|
|
|
|
if e.errno != errno.EEXIST:
|
|
|
|
raise
|
|
|
|
|
2011-12-27 15:02:16 +01:00
|
|
|
def maybe_open(really, name, opt):
|
|
|
|
if really:
|
|
|
|
return open(name, opt)
|
2011-12-28 11:26:58 +01:00
|
|
|
else:
|
|
|
|
import StringIO
|
|
|
|
return StringIO.StringIO()
|
2011-12-27 15:02:16 +01:00
|
|
|
|
|
|
|
fdef = maybe_open(do_c, c_file, 'w')
|
|
|
|
fdecl = maybe_open(do_h, h_file, 'w')
|
2011-07-19 21:50:41 +02:00
|
|
|
|
|
|
|
fdef.write(mcgen('''
|
|
|
|
/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* schema-defined QAPI visitor functions
|
|
|
|
*
|
|
|
|
* Copyright IBM, Corp. 2011
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2012-12-06 11:22:34 +01:00
|
|
|
#include "qemu-common.h"
|
2011-07-19 21:50:41 +02:00
|
|
|
#include "%(header)s"
|
|
|
|
''',
|
|
|
|
header=basename(h_file)))
|
|
|
|
|
|
|
|
fdecl.write(mcgen('''
|
|
|
|
/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* schema-defined QAPI visitor function
|
|
|
|
*
|
|
|
|
* Copyright IBM, Corp. 2011
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef %(guard)s
|
|
|
|
#define %(guard)s
|
|
|
|
|
2012-12-17 18:19:43 +01:00
|
|
|
#include "qapi/visitor.h"
|
2011-07-19 21:50:41 +02:00
|
|
|
#include "%(prefix)sqapi-types.h"
|
2013-05-11 00:46:02 +02:00
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
''',
|
|
|
|
prefix=prefix, guard=guardname(h_file)))
|
|
|
|
|
|
|
|
exprs = parse_schema(sys.stdin)
|
|
|
|
|
2013-05-11 00:46:02 +02:00
|
|
|
# to avoid header dependency hell, we always generate declarations
|
|
|
|
# for built-in types in our header files and simply guard them
|
|
|
|
fdecl.write(guardstart("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
|
|
|
|
for typename in builtin_types:
|
|
|
|
fdecl.write(generate_declaration(typename, None, genlist=True,
|
|
|
|
builtin_type=True))
|
|
|
|
fdecl.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
|
|
|
|
|
|
|
|
# ...this doesn't work for cases where we link in multiple objects that
|
|
|
|
# have the functions defined, so we use -b option to provide control
|
|
|
|
# over these cases
|
|
|
|
if do_builtins:
|
|
|
|
fdef.write(guardstart("QAPI_VISIT_BUILTIN_VISITOR_DEF"))
|
|
|
|
for typename in builtin_types:
|
|
|
|
fdef.write(generate_visit_list(typename, None))
|
|
|
|
fdef.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DEF"))
|
|
|
|
|
2011-07-19 21:50:41 +02:00
|
|
|
for expr in exprs:
|
|
|
|
if expr.has_key('type'):
|
|
|
|
ret = generate_visit_struct(expr['type'], expr['data'])
|
|
|
|
ret += generate_visit_list(expr['type'], expr['data'])
|
|
|
|
fdef.write(ret)
|
|
|
|
|
|
|
|
ret = generate_declaration(expr['type'], expr['data'])
|
|
|
|
fdecl.write(ret)
|
|
|
|
elif expr.has_key('union'):
|
2013-07-02 16:20:04 +02:00
|
|
|
ret = generate_visit_union(expr)
|
2012-03-06 18:55:56 +01:00
|
|
|
ret += generate_visit_list(expr['union'], expr['data'])
|
2011-07-19 21:50:41 +02:00
|
|
|
fdef.write(ret)
|
|
|
|
|
|
|
|
ret = generate_decl_enum('%sKind' % expr['union'], expr['data'].keys())
|
|
|
|
ret += generate_declaration(expr['union'], expr['data'])
|
|
|
|
fdecl.write(ret)
|
|
|
|
elif expr.has_key('enum'):
|
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: Amos Kong <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
2012-08-31 04:56:23 +02:00
|
|
|
ret = generate_visit_list(expr['enum'], expr['data'])
|
|
|
|
ret += generate_visit_enum(expr['enum'], expr['data'])
|
2011-07-19 21:50:41 +02:00
|
|
|
fdef.write(ret)
|
|
|
|
|
|
|
|
ret = generate_decl_enum(expr['enum'], expr['data'])
|
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: Amos Kong <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
2012-08-31 04:56:23 +02:00
|
|
|
ret += generate_enum_declaration(expr['enum'], expr['data'])
|
2011-07-19 21:50:41 +02:00
|
|
|
fdecl.write(ret)
|
|
|
|
|
|
|
|
fdecl.write('''
|
|
|
|
#endif
|
|
|
|
''')
|
|
|
|
|
|
|
|
fdecl.flush()
|
|
|
|
fdecl.close()
|
|
|
|
|
|
|
|
fdef.flush()
|
|
|
|
fdef.close()
|