diff options
| author | Anthony Liguori | 2011-10-31 17:02:29 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-10-31 17:02:29 +0100 |
| commit | 96b3d73f5ad5838690d42666c566a48be9d173dc (patch) | |
| tree | ff8308c6bb8494acc5f698308fded86cc5cd4e67 /scripts | |
| parent | Merge remote-tracking branch 'qemu-kvm-tmp/uq/master' into staging (diff) | |
| parent | Drop qemu-objects.h from modules that don't require it (diff) | |
| download | qemu-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.gz qemu-96b3d73f5ad5838690d42666c566a48be9d173dc.tar.xz qemu-96b3d73f5ad5838690d42666c566a48be9d173dc.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Conflicts:
ui/spice-core.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi-commands.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c947ba4208..f7def16662 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -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) |