diff mbox

[18/36] qapi: remove "middle" mode

Message ID 1443189844-20341-19-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Sept. 25, 2015, 2:03 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Now that the register function is always generated, we can
remove the so-called "middle" mode to the generator script.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 scripts/qapi-commands.py | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

Comments

Eric Blake Sept. 25, 2015, 4:03 p.m. UTC | #1 
On 09/25/2015 08:03 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Now that the register function is always generated, we can
> remove the so-called "middle" mode to the generator script.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  scripts/qapi-commands.py | 29 +++++------------------------
>  1 file changed, 5 insertions(+), 24 deletions(-)

Yay. Although I haven't closely reviewed this one, I like the concept.
diff mbox

Patch

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 9d2708f..4db1ae3 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -179,17 +179,8 @@  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):
@@ -263,8 +254,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
 
@@ -276,21 +266,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 = '''
 /*