[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/12] qapi: remove the "middle" mode
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH 09/12] qapi: remove the "middle" mode |
Date: |
Thu, 23 Jun 2016 02:08:06 +0200 |
From: Marc-André Lureau <address@hidden>
Now that the register function is always generated, we can
remove the so-called "middle" mode from the generator script.
Signed-off-by: Marc-André Lureau <address@hidden>
---
scripts/qapi-commands.py | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 8d25701..70a07b3 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -84,17 +84,8 @@ static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in,
QObject **ret_out,
def gen_marshal_proto(name):
- ret = 'void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)' %
c_name(name)
- if not middle_mode:
- ret = 'static ' + ret
- return ret
-
-
-def gen_marshal_decl(name):
- return mcgen('''
-%(proto)s;
-''',
- proto=gen_marshal_proto(name))
+ return 'static void qmp_marshal_%s' % c_name(name) + \
+ '(QDict *args, QObject **ret, Error **errp)'
def gen_marshal(name, arg_type, box, ret_type):
@@ -209,8 +200,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
self._visited_ret_types = set()
def visit_end(self):
- if not middle_mode:
- self.defn += gen_registry(self._regy)
+ self.defn += gen_registry(self._regy)
self._regy = None
self._visited_ret_types = None
@@ -222,21 +212,12 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
if ret_type and ret_type not in self._visited_ret_types:
self._visited_ret_types.add(ret_type)
self.defn += gen_marshal_output(ret_type)
- if middle_mode:
- self.decl += gen_marshal_decl(name)
self.defn += gen_marshal(name, arg_type, box, ret_type)
- if not middle_mode:
- self._regy += gen_register_command(name, success_response)
-
+ self._regy += gen_register_command(name, success_response)
-middle_mode = False
(input_file, output_dir, do_c, do_h, prefix, opts) = \
- parse_command_line("m", ["middle"])
-
-for o, a in opts:
- if o in ("-m", "--middle"):
- middle_mode = True
+ parse_command_line()
c_comment = '''
/*
--
2.9.0
- [Qemu-devel] [PATCH 00/12] qapi: remove the 'middle' mode, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 03/12] monitor: register gen:false commands manually, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 04/12] monitor: remove usage of generated marshal functions, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 02/12] qapi-schema: add 'device_add', marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 01/12] qapi-schema: use generated marshaller for 'qmp_capabilities', marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 05/12] monitor: register the qapi generated commands, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 07/12] monitor: implement 'qmp_query_commands' without qmp_cmds, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 06/12] monitor: remove mhandler.cmd_new, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 08/12] build-sys: remove qmp-commands-old.h, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 09/12] qapi: remove the "middle" mode,
marcandre . lureau <=
- [Qemu-devel] [PATCH 10/12] monitor: use qmp_dispatch(), marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 11/12] qmp: update qmp_query_spice fallback, marcandre . lureau, 2016/06/22
- [Qemu-devel] [PATCH 12/12] Drop qmp-commands.hx, marcandre . lureau, 2016/06/22