This reverts commit 22ff4d4ac6cd553f328e400de6913dc879581c4c. Signed-off-by: Markus Armbruster <arm...@redhat.com> --- scripts/qapi-commands.py | 7 ------- scripts/qapi-event.py | 12 ------------ scripts/qapi-types.py | 18 ------------------ scripts/qapi-visit.py | 12 ------------ scripts/qapi.py | 5 ----- 5 files changed, 54 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c3afb64..12bdc4c 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -24,7 +24,6 @@ def generate_command_decl(name, args, ret_type): arglist += "bool has_%s, " % c_name(argname) arglist += "%s %s, " % (argtype, c_name(argname)) return mcgen(''' -// decl qmp_%(name)s %(ret_type)s qmp_%(name)s(%(args)sError **errp); ''', ret_type=c_type(ret_type), name=c_name(name), @@ -161,7 +160,6 @@ def gen_marshal_output(name, ret_type): return "" ret = mcgen(''' -// def qmp_marshal_output_%(c_name)s static void qmp_marshal_output_%(c_name)s(%(c_ret_type)s ret_in, QObject **ret_out, Error **errp) { Error *local_err = NULL; @@ -200,12 +198,10 @@ def gen_marshal_input(name, args, ret_type, middle_mode): hdr = gen_marshal_input_decl(name, middle_mode) ret = mcgen(''' -// def qmp_marshal_input_%(name)s %(header)s { Error *local_err = NULL; ''', - name=name, header=hdr) if ret_type: @@ -256,7 +252,6 @@ qmp_register_command("%(name)s", qmp_marshal_input_%(c_name)s, %(opts)s); opts=options) pop_indent() ret = mcgen(''' -// def qmp_init_marshal static void qmp_init_marshal(void) { ''') @@ -264,7 +259,6 @@ static void qmp_init_marshal(void) ret += mcgen(''' } -// decl qapi_init qapi_init(qmp_init_marshal); ''') return ret @@ -353,7 +347,6 @@ for cmd in commands: fdef.write(ret) if middle_mode: - fdecl.write('// decl gen_marshal_input_%s\n' % cmd['command']) fdecl.write('%s;\n' % gen_marshal_input_decl(cmd['command'], middle_mode)) ret = gen_marshal_input(cmd['command'], arglist, ret_type, middle_mode) + "\n" diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index e511437..aec2d32 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -9,7 +9,6 @@ # This work is licensed under the terms of the GNU GPL, version 2. # See the COPYING file in the top-level directory. -import re; from ordereddict import OrderedDict from qapi import * @@ -34,30 +33,22 @@ def _generate_event_api_name(event_name, params): # Following are the core functions that generate C APIs to emit event. def generate_event_declaration(api_name): - match = re.match(r'void ([A-Za-z0-9_]+)', api_name) - name = match.group(1) return mcgen(''' -// decl %(name)s %(api_name)s; ''', - name=name, api_name = api_name) def generate_event_implement(api_name, event_name, params): - match = re.match(r'void ([A-Za-z0-9_]+)', api_name) - name = match.group(1) # step 1: declare any variables ret = mcgen(""" -// def %(name)s %(api_name)s { QDict *qmp; Error *local_err = NULL; QMPEventFuncEmit emit; """, - name=name, api_name = api_name) if params: @@ -171,13 +162,11 @@ def generate_event_implement(api_name, event_name, params): def generate_event_enum_decl(event_enum_name, event_enum_values): lookup_decl = mcgen(''' -// decl %(event_enum_name)s_lookup extern const char *%(event_enum_name)s_lookup[]; ''', event_enum_name = event_enum_name) enum_decl = mcgen(''' -// typedef %(event_enum_name)s typedef enum %(event_enum_name)s { ''', event_enum_name = event_enum_name) @@ -205,7 +194,6 @@ typedef enum %(event_enum_name)s { def generate_event_enum_lookup(event_enum_name, event_enum_strings): ret = mcgen(''' -// def %(event_enum_name)s_lookup const char *%(event_enum_name)s_lookup[] = { ''', event_enum_name = event_enum_name) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 7fabcaa..124a788 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -15,10 +15,8 @@ from qapi import * def generate_fwd_builtin(name): return mcgen(''' -// typedef %(name)sList typedef struct %(name)sList %(name)sList; -// struct %(name)sList struct %(name)sList { union { %(type)s value; @@ -33,13 +31,10 @@ struct %(name)sList { def generate_fwd_struct(name): return mcgen(''' -// typedef %(name)s typedef struct %(name)s %(name)s; -// typedef %(name)sList typedef struct %(name)sList %(name)sList; -// struct %(name)sList struct %(name)sList { union { %(name)s *value; @@ -53,10 +48,8 @@ struct %(name)sList { def generate_fwd_enum_struct(name): return mcgen(''' -// typedef %(name)sList typedef struct %(name)sList %(name)sList; -// struct %(name)sList struct %(name)sList { union { %(name)s value; @@ -91,7 +84,6 @@ def generate_struct(expr): ret = mcgen(''' -// struct %(name)s struct %(name)s { ''', name=c_name(structname)) @@ -118,7 +110,6 @@ struct %(name)s { def generate_enum_lookup(name, values): ret = mcgen(''' -// def %(name)s_lookup const char *const %(name)s_lookup[] = { ''', name=c_name(name)) @@ -141,14 +132,12 @@ def generate_enum(name, values): name = c_name(name) lookup_decl = mcgen(''' -// decl %(name)s_lookup extern const char *const %(name)s_lookup[]; ''', name=name) enum_decl = mcgen(''' -// typedef %(name)s typedef enum %(name)s { ''', name=name) @@ -180,7 +169,6 @@ def generate_alternate_qtypes(expr): ret = mcgen(''' -// def %(name)s_qtypes const int %(name)s_qtypes[QTYPE_MAX] = { ''', name=c_name(name)) @@ -217,7 +205,6 @@ def generate_union(expr, meta): ret = mcgen(''' -// struct %(name)s struct %(name)s { ''', name=name) @@ -265,8 +252,6 @@ struct %(name)s { ''') if meta == 'alternate': ret += mcgen(''' - -// decl %(name)s_qtypes extern const int %(name)s_qtypes[]; ''', name=name) @@ -276,8 +261,6 @@ extern const int %(name)s_qtypes[]; def generate_type_cleanup_decl(name): ret = mcgen(''' - -// decl qapi_free_%(name)s void qapi_free_%(name)s(%(c_type)s obj); ''', c_type=c_type(name), name=c_name(name)) @@ -286,7 +269,6 @@ void qapi_free_%(name)s(%(c_type)s obj); def generate_type_cleanup(name): ret = mcgen(''' -// def qapi_free_%(name)s void qapi_free_%(name)s(%(c_type)s obj) { QapiDeallocVisitor *md; diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index f0fef55..c493964 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -28,14 +28,12 @@ def generate_visit_implicit_struct(type): # Need a forward declaration ret += mcgen(''' -// def visit_type_%(c_type)s_fields static void visit_type_%(c_type)s_fields(Visitor *m, %(c_type)s **obj, Error **errp); ''', c_type=type_name(type)) ret += mcgen(''' -// def visit_type_implicit_%(c_type)s static void visit_type_implicit_%(c_type)s(Visitor *m, %(c_type)s **obj, Error **errp) { Error *err = NULL; @@ -61,7 +59,6 @@ def generate_visit_struct_fields(name, members, base = None): ret += mcgen(''' -// def visit_type_%(name)s_fields static void visit_type_%(name)s_fields(Visitor *m, %(name)s **obj, Error **errp) { Error *err = NULL; @@ -149,7 +146,6 @@ def generate_visit_struct(expr): ret += mcgen(''' -// def visit_type_%(name)s void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **errp) { ''', @@ -165,7 +161,6 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e def generate_visit_list(name): return mcgen(''' -// def visit_type_%(name)sList void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp) { Error *err = NULL; @@ -195,7 +190,6 @@ out: def generate_visit_enum(name): return mcgen(''' -// def visit_type_%(c_name)s void visit_type_%(c_name)s(Visitor *m, %(c_name)s *obj, const char *name, Error **errp) { visit_type_enum(m, (int *)obj, %(c_name)s_lookup, "%(name)s", name, errp); @@ -206,7 +200,6 @@ void visit_type_%(c_name)s(Visitor *m, %(c_name)s *obj, const char *name, Error def generate_visit_alternate(name, members): ret = mcgen(''' -// def visit_type_%(name)s void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **errp) { Error *err = NULL; @@ -290,7 +283,6 @@ def generate_visit_union(expr): ret += mcgen(''' -// def visit_type_%(c_name)s void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error **errp) { Error *err = NULL; @@ -373,13 +365,11 @@ def generate_declaration(name, builtin_type=False): name = c_name(name) ret += mcgen(''' -// decl visit_type_%(name)s void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **errp); ''', name=name) ret += mcgen(''' -// decl visit_type_%(name)sList void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp); ''', name=name) @@ -388,7 +378,6 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, E def generate_enum_declaration(name): ret = mcgen(''' -// decl visit_type_%(name)sList void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, Error **errp); ''', name=c_name(name)) @@ -398,7 +387,6 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList **obj, const char *name, E def generate_decl_enum(name): return mcgen(''' -// decl visit_type_%(name)s void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **errp); ''', name=c_name(name)) diff --git a/scripts/qapi.py b/scripts/qapi.py index 1a1a4e6..fd52a9a 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1463,7 +1463,6 @@ def guardname(filename): def guardstart(name): return mcgen(''' -// guardstart %(name)s #ifndef %(name)s #define %(name)s @@ -1473,7 +1472,6 @@ def guardstart(name): def guardend(name): return mcgen(''' -// guardend %(name)s #endif /* %(name)s */ ''', @@ -1558,14 +1556,12 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file, fdecl = maybe_open(do_h, h_file, 'w') fdef.write(mcgen(''' -// prologue /* AUTOMATICALLY GENERATED, DO NOT MODIFY */ %(comment)s ''', comment = c_comment)) fdecl.write(mcgen(''' -// prologue /* AUTOMATICALLY GENERATED, DO NOT MODIFY */ %(comment)s #ifndef %(guard)s @@ -1578,7 +1574,6 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file, def close_output(fdef, fdecl): fdecl.write(''' -// epilogue #endif ''') fdecl.close() -- 2.4.3