diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-16 15:34:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-16 15:34:38 +0100 |
| commit | 102ad0a80f5110483efd06877c29c4236be267f9 (patch) | |
| tree | 07ccf2bf9fc0162dcab349b5239e6db832eb2db6 /scripts | |
| parent | 633e824037210a60c0b23d6c0e42420db1fe4c08 (diff) | |
| parent | 8720e63e09fa1e48dbd244d89d6fed6b5c50889d (diff) | |
| download | qemu-102ad0a80f5110483efd06877c29c4236be267f9.zip qemu-102ad0a80f5110483efd06877c29c4236be267f9.tar.gz qemu-102ad0a80f5110483efd06877c29c4236be267f9.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-07-16' into staging
Miscellaneous patches for 2018-07-16 (3.0.0-rc1)
# gpg: Signature made Mon 16 Jul 2018 14:50:07 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-misc-2018-07-16:
monitor: Fix tracepoint crash on JSON syntax error
MAINTAINERS: New section "Incompatible changes", copy libvir-list
qemu-doc: Move appendix "Deprecated features" to its own file
cli qmp: Mark --preconfig, exit-preconfig experimental
qapi: Do not expose "allow-preconfig" in query-qmp-schema
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi/introspect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 71d4a77..70ca5dd 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -187,8 +187,8 @@ const QLitObject %(c_name)s = %(c_string)s; self._gen_qlit(name, 'command', {'arg-type': self._use_type(arg_type), 'ret-type': self._use_type(ret_type), - 'allow-oob': allow_oob, - 'allow-preconfig': allow_preconfig}, ifcond) + 'allow-oob': allow_oob}, + ifcond) def visit_event(self, name, info, ifcond, arg_type, boxed): arg_type = arg_type or self._schema.the_empty_object_type |