diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-10-29 19:42:36 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-10-29 19:42:36 -0700 |
| commit | dd61b91c080cdfba1360a5ea1e4693fffb3445b0 (patch) | |
| tree | f5b3cec0b0af415826cdf979ba49fe7e6fc0f8dc /monitor | |
| parent | a856cce31b48ef1b04ea80893458766ec16e7194 (diff) | |
| parent | 57df0dff1a1f4c846aa74a082bfd595a8a990015 (diff) | |
| download | qemu-dd61b91c080cdfba1360a5ea1e4693fffb3445b0.zip qemu-dd61b91c080cdfba1360a5ea1e4693fffb3445b0.tar.gz qemu-dd61b91c080cdfba1360a5ea1e4693fffb3445b0.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-10-29' into staging
QAPI patches patches for 2021-10-29
# gpg: Signature made Fri 29 Oct 2021 12:28:53 PM PDT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
* remotes/armbru/tags/pull-qapi-2021-10-29:
qapi: Extend -compat to set policy for unstable interfaces
qapi: Factor out compat_policy_input_ok()
qapi: Generalize enum member policy checking
qapi: Generalize command policy checking
qapi: Generalize struct member policy checking
qapi: Tools for sets of special feature flags in generated code
qapi: Eliminate QCO_NO_OPTIONS for a slight simplification
qapi: Mark unstable QMP parts with feature 'unstable'
qapi: New special feature flag "unstable"
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/misc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/monitor/misc.c b/monitor/misc.c index ffe7966..c2d227a 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -230,12 +230,13 @@ static void monitor_init_qmp_commands(void) qmp_init_marshal(&qmp_commands); - qmp_register_command(&qmp_commands, "device_add", qmp_device_add, - QCO_NO_OPTIONS); + qmp_register_command(&qmp_commands, "device_add", + qmp_device_add, 0, 0); QTAILQ_INIT(&qmp_cap_negotiation_commands); qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities", - qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG); + qmp_marshal_qmp_capabilities, + QCO_ALLOW_PRECONFIG, 0); } /* Set the current CPU defined by the user. Callers must hold BQL. */ |