diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-02-14 16:22:50 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-02-18 14:44:05 +0100 |
| commit | 9d7b70864af66a6ce04abafd4a06915cbfab16e2 (patch) | |
| tree | 5f4b9611e74058d3f6c28dccda8043040dbf3948 | |
| parent | 093e3679517f910cc99f35b2259469472c6df9b8 (diff) | |
| download | focaccia-qemu-9d7b70864af66a6ce04abafd4a06915cbfab16e2.tar.gz focaccia-qemu-9d7b70864af66a6ce04abafd4a06915cbfab16e2.zip | |
qmp: Deprecate query-events in favor of query-qmp-schema
query-events doesn't reflect compile-time configuration. Instead of fixing that, deprecate the command in favor of query-qmp-schema. Libvirt prefers query-qmp-schema as of commit 22d7222ec0 "qemu: caps: Don't call 'query-events' when we probe events from QMP schema". It'll be in the next release. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20190214152251.2073-18-armbru@redhat.com>
| -rw-r--r-- | monitor.c | 5 | ||||
| -rw-r--r-- | qapi/misc.json | 7 | ||||
| -rw-r--r-- | qemu-deprecated.texi | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c index 1673db7015..33ccbf3957 100644 --- a/monitor.c +++ b/monitor.c @@ -1099,6 +1099,11 @@ CommandInfoList *qmp_query_commands(Error **errp) EventInfoList *qmp_query_events(Error **errp) { + /* + * TODO This deprecated command is the only user of + * QAPIEvent_str() and QAPIEvent_lookup[]. When the command goes, + * they should go, too. + */ EventInfoList *info, *ev_list = NULL; QAPIEvent e; diff --git a/qapi/misc.json b/qapi/misc.json index 82f9147353..98f59f828a 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -318,12 +318,15 @@ ## # @query-events: # -# Return a list of supported QMP events by this server +# Return information on QMP events. # -# Returns: A list of @EventInfo for all supported events +# Returns: A list of @EventInfo. # # Since: 1.2.0 # +# Note: This command is deprecated, because its output doesn't reflect +# compile-time configuration. Use query-qmp-schema instead. +# # Example: # # -> { "execute": "query-events" } diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index fe905551c5..45c57952da 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -82,6 +82,11 @@ Use ``device_add'' for hotplugging vCPUs instead of ``cpu-add''. See documentation of ``query-hotpluggable-cpus'' for additional details. +@subsection query-events (since 4.0) + +The ``query-events'' command has been superseded by the more powerful +and accurate ``query-qmp-schema'' command. + @section Human Monitor Protocol (HMP) commands @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) |