openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-04-02 14:52:55 +02:00
parent 09896d3f48
commit 4180978c92
1 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
scripts/qapi-commands.py
View File

@ -309,36 +309,6 @@ def gen_registry(commands):
registry=registry.rstrip()) registry=registry.rstrip())
return ret return ret
def gen_command_decl_prologue(prefix=""):
ret = mcgen('''
#include "%(prefix)sqapi-types.h"
#include "qapi/qmp/qdict.h"
#include "qapi/error.h"
''',
prefix=prefix)
return ret
def gen_command_def_prologue(prefix="", proxy=False):
ret = mcgen('''
#include "qemu-common.h"
#include "qemu/module.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/dispatch.h"
#include "qapi/visitor.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.h"
''',
prefix=prefix)
if not proxy:
ret += '#include "%sqmp-commands.h"' % prefix
return ret + "\n\n"
middle_mode = False middle_mode = False
(input_file, output_dir, do_c, do_h, prefix, opts) = \ (input_file, output_dir, do_c, do_h, prefix, opts) = \
@ -385,10 +355,30 @@ def gen_command_def_prologue(prefix="", proxy=False):
'qmp-marshal.c', 'qmp-commands.h', 'qmp-marshal.c', 'qmp-commands.h',
c_comment, h_comment) c_comment, h_comment)
ret = gen_command_decl_prologue(prefix=prefix) fdef.write(mcgen('''
fdecl.write(ret) #include "qemu-common.h"
ret = gen_command_def_prologue(prefix=prefix) #include "qemu/module.h"
fdef.write(ret) #include "qapi/qmp/qerror.h"
#include "qapi/qmp/types.h"
#include "qapi/qmp/dispatch.h"
#include "qapi/visitor.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi/qmp-input-visitor.h"
#include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.h"
#include "%(prefix)sqmp-commands.h"
''',
prefix=prefix))
fdecl.write(mcgen('''
#include "%(prefix)sqapi-types.h"
#include "qapi/qmp/qdict.h"
#include "qapi/error.h"
''',
prefix=prefix))
for cmd in commands: for cmd in commands:
arglist = [] arglist = []