diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-23 15:15:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-23 15:15:46 +0100 |
| commit | 9ba7dd14355bb7957680d5ef764471ab102df099 (patch) | |
| tree | 7b25641ad2d46dca31fe8cb540d2213cf26b4065 /scripts/qapi/introspect.py | |
| parent | 55b1f14cefcb19ce6d5e28c4c83404230888aa7e (diff) | |
| parent | 62aa1d887ff9fc76adb488d31447d126a78f4b8f (diff) | |
| download | focaccia-qemu-9ba7dd14355bb7957680d5ef764471ab102df099.tar.gz focaccia-qemu-9ba7dd14355bb7957680d5ef764471ab102df099.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-07-23' into staging
QAPI and monitor patches for 2018-07-23 (3.0.0-rc2) # gpg: Signature made Mon 23 Jul 2018 14:08:37 BST # gpg: using RSA key 3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2018-07-23: monitor: Fix unsafe sharing of @cur_mon among threads qapi: Make 'allow-oob' optional in SchemaInfoCommand Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi/introspect.py')
| -rw-r--r-- | scripts/qapi/introspect.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 70ca5dd876..189a4edaba 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -184,11 +184,11 @@ const QLitObject %(c_name)s = %(c_string)s; success_response, boxed, allow_oob, allow_preconfig): arg_type = arg_type or self._schema.the_empty_object_type ret_type = ret_type or self._schema.the_empty_object_type - self._gen_qlit(name, 'command', - {'arg-type': self._use_type(arg_type), - 'ret-type': self._use_type(ret_type), - 'allow-oob': allow_oob}, - ifcond) + obj = {'arg-type': self._use_type(arg_type), + 'ret-type': self._use_type(ret_type) } + if allow_oob: + obj['allow-oob'] = allow_oob + self._gen_qlit(name, 'command', obj, ifcond) def visit_event(self, name, info, ifcond, arg_type, boxed): arg_type = arg_type or self._schema.the_empty_object_type |