[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/26] qapi: qapi-commands.py option --type is unused
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 20/26] qapi: qapi-commands.py option --type is unused, drop it |
Date: |
Fri, 15 May 2015 10:24:46 +0200 |
Anything but --type sync (which is the default) suppresses output
entirely, which makes no sense.
Dates back to the initial commit c17d990. Commit message says
"Currently only generators for synchronous qapi/qmp functions are
supported", so maybe output other than "synchronous qapi/qmp" was
planned at the time, to be selected with --type.
Should other kinds of output ever materialize, we can put the option
back.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-commands.py | 66 +++++++++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 35 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 0a1d636..c94a19b 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -381,14 +381,13 @@ try:
opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:i:o:m",
["source", "header", "prefix=",
"input-file=", "output-dir=",
- "type=", "middle"])
+ "middle"])
except getopt.GetoptError, err:
print str(err)
sys.exit(1)
output_dir = ""
prefix = ""
-dispatch_type = "sync"
c_file = 'qmp-marshal.c'
h_file = 'qmp-commands.h'
middle_mode = False
@@ -403,8 +402,6 @@ for o, a in opts:
input_file = a
elif o in ("-o", "--output-dir"):
output_dir = a + "/"
- elif o in ("-t", "--type"):
- dispatch_type = a
elif o in ("-m", "--middle"):
middle_mode = True
elif o in ("-c", "--source"):
@@ -436,40 +433,39 @@ exprs = parse_schema(input_file)
commands = filter(lambda expr: expr.has_key('command'), exprs)
commands = filter(lambda expr: not expr.has_key('gen'), commands)
-if dispatch_type == "sync":
- fdecl = maybe_open(do_h, h_file, 'w')
- fdef = maybe_open(do_c, c_file, 'w')
- ret = gen_command_decl_prologue(header=basename(h_file),
guard=guardname(h_file), prefix=prefix)
+fdecl = maybe_open(do_h, h_file, 'w')
+fdef = maybe_open(do_c, c_file, 'w')
+ret = gen_command_decl_prologue(header=basename(h_file),
guard=guardname(h_file), prefix=prefix)
+fdecl.write(ret)
+ret = gen_command_def_prologue(prefix=prefix)
+fdef.write(ret)
+
+for cmd in commands:
+ arglist = []
+ ret_type = None
+ if cmd.has_key('data'):
+ arglist = cmd['data']
+ if cmd.has_key('returns'):
+ ret_type = cmd['returns']
+ ret = generate_command_decl(cmd['command'], arglist, ret_type) + "\n"
fdecl.write(ret)
- ret = gen_command_def_prologue(prefix=prefix)
- fdef.write(ret)
-
- for cmd in commands:
- arglist = []
- ret_type = None
- if cmd.has_key('data'):
- arglist = cmd['data']
- if cmd.has_key('returns'):
- ret_type = cmd['returns']
- ret = generate_command_decl(cmd['command'], arglist, ret_type) + "\n"
- fdecl.write(ret)
- if ret_type:
- ret = gen_marshal_output(cmd['command'], arglist, ret_type,
middle_mode) + "\n"
- fdef.write(ret)
+ if ret_type:
+ ret = gen_marshal_output(cmd['command'], arglist, ret_type,
middle_mode) + "\n"
+ fdef.write(ret)
- if middle_mode:
- fdecl.write('%s;\n' % gen_marshal_input_decl(cmd['command'],
arglist, ret_type, middle_mode))
+ if middle_mode:
+ fdecl.write('%s;\n' % gen_marshal_input_decl(cmd['command'], arglist,
ret_type, middle_mode))
- ret = gen_marshal_input(cmd['command'], arglist, ret_type,
middle_mode) + "\n"
- fdef.write(ret)
+ ret = gen_marshal_input(cmd['command'], arglist, ret_type, middle_mode) +
"\n"
+ fdef.write(ret)
- fdecl.write("\n#endif\n");
+fdecl.write("\n#endif\n");
- if not middle_mode:
- ret = gen_registry(commands)
- fdef.write(ret)
+if not middle_mode:
+ ret = gen_registry(commands)
+ fdef.write(ret)
- fdef.flush()
- fdef.close()
- fdecl.flush()
- fdecl.close()
+fdef.flush()
+fdef.close()
+fdecl.flush()
+fdecl.close()
--
1.9.3
- [Qemu-devel] [PULL 08/26] qapi: Use c_enum_const() in generate_alternate_qtypes(), (continued)
- [Qemu-devel] [PULL 08/26] qapi: Use c_enum_const() in generate_alternate_qtypes(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 01/26] qmp: Add qom_path field to query-cpus command, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 07/26] qapi: Simplify c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 05/26] qapi: Rename _generate_enum_string() to camel_to_upper(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 06/26] qapi: Rename generate_enum_full_value() to c_enum_const(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 14/26] qapi: Support downstream simple unions, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 03/26] qapi: Fix C identifiers generated for names containing '.', Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 18/26] tests: Add missing dependencies on $(qapi-py), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 26/26] qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 25/26] qapi: Drop pointless flush() before close(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 20/26] qapi: qapi-commands.py option --type is unused, drop it,
Markus Armbruster <=
- [Qemu-devel] [PULL 11/26] qapi: Make c_type() consistently convert qapi names, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 19/26] qapi: qapi-event.py option -b does nothing, drop it, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 04/26] qapi: Rename identical c_fun()/c_var() into c_name(), Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 23/26] qapi: Turn generators' mandatory option -i into an argument, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 24/26] qapi: Factor open_output(), close_output() out of generators, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 13/26] qapi: Support downstream structs, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 22/26] qapi: Fix generators to report command line errors decently, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 15/26] qapi: Support downstream flat unions, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 10/26] qapi: Tidy c_type() logic, Markus Armbruster, 2015/05/15
- [Qemu-devel] [PULL 16/26] qapi: Support downstream alternates, Markus Armbruster, 2015/05/15