| Message ID | 20181218182234.28876-15-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: add #if pre-processor conditions to generated code (part 3) | expand |
Hi On Tue, Dec 18, 2018 at 10:30 PM Markus Armbruster <armbru@redhat.com> wrote: > > query-events doesn't reflect compile-time configuration. Instead of > fixing that, deprecate the command in favor of query-qmp-schema. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > monitor.c | 5 +++++ > qapi/misc.json | 7 +++++-- > qemu-deprecated.texi | 5 +++++ > 3 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/monitor.c b/monitor.c > index 967abebcaf..202989fe17 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 c981008bac..91d5bf6a8a 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 e362d37225..110dfd7a59 100644 > --- a/qemu-deprecated.texi > +++ b/qemu-deprecated.texi > @@ -106,6 +106,11 @@ The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. > The ``arch'' output member of the ``query-cpus-fast'' command is > replaced by the ``target'' output member. > > +@subsection query-events > + > +The ``query-events'' command has been superseded by the more powerful > +and accurate ``query-qmp-schema'' command. > + > @section System emulator human monitor commands > > @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) > -- > 2.17.2 > >
diff --git a/monitor.c b/monitor.c index 967abebcaf..202989fe17 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 c981008bac..91d5bf6a8a 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 e362d37225..110dfd7a59 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -106,6 +106,11 @@ The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. The ``arch'' output member of the ``query-cpus-fast'' command is replaced by the ``target'' output member. +@subsection query-events + +The ``query-events'' command has been superseded by the more powerful +and accurate ``query-qmp-schema'' command. + @section System emulator human monitor commands @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1)
query-events doesn't reflect compile-time configuration. Instead of fixing that, deprecate the command in favor of query-qmp-schema. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- monitor.c | 5 +++++ qapi/misc.json | 7 +++++-- qemu-deprecated.texi | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-)