motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-17 21:26:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmp/queue/qmp' into staging

Browse source 
Conflicts:
	ui/spice-core.c
This commit is contained in:
Anthony Liguori 2011-10-31 11:02:29 -05:00
commit 96b3d73f5a
27 changed files with 1623 additions and 1066 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/qapi-commands.py
View file

@ -62,7 +62,9 @@ def gen_sync_call(name, args, ret_type, indent=0):
name=c_var(name), args=arglist, retval=retval).rstrip()
if ret_type:
ret += "\n" + mcgen(''''
%(marshal_output_call)s
if (!error_is_set(errp)) {
%(marshal_output_call)s
}
''',
marshal_output_call=gen_marshal_output_call(name, ret_type)).rstrip()
pop_indent(indent)