* Philippe Mathieu-Daudé (phi...@linaro.org) wrote:
> Since commit 1b65b4f54c7 ("accel/tcg: remove CONFIG_PROFILER",
> released with QEMU v8.1.0) we get pointless output:
>
> (qemu) info opcount
> [TCG profiler not compiled]
>
> Remove that unstable and unuseful command.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
For HMP
Acked-by: Dr. David Alan Gilbert <d...@treblig.org>
> ---
> qapi/machine.json | 18 ------------------
> accel/tcg/monitor.c | 21 ---------------------
> tests/qtest/qmp-cmd-test.c | 1 -
> hmp-commands-info.hx | 14 --------------
> 4 files changed, 54 deletions(-)
>
> diff --git a/qapi/machine.json b/qapi/machine.json
> index d5bbb5e367e..acf6610efa5 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -1764,24 +1764,6 @@
> 'returns': 'HumanReadableText',
> 'features': [ 'unstable' ] }
>
> -##
> -# @x-query-opcount:
> -#
> -# Query TCG opcode counters
> -#
> -# Features:
> -#
> -# @unstable: This command is meant for debugging.
> -#
> -# Returns: TCG opcode counters
> -#
> -# Since: 6.2
> -##
> -{ 'command': 'x-query-opcount',
> - 'returns': 'HumanReadableText',
> - 'if': 'CONFIG_TCG',
> - 'features': [ 'unstable' ] }
> -
> ##
> # @x-query-ramblock:
> #
> diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c
> index 1c182b6bfb5..7c686226b21 100644
> --- a/accel/tcg/monitor.c
> +++ b/accel/tcg/monitor.c
> @@ -215,30 +215,9 @@ HumanReadableText *qmp_x_query_jit(Error **errp)
> return human_readable_text_from_str(buf);
> }
>
> -static void tcg_dump_op_count(GString *buf)
> -{
> - g_string_append_printf(buf, "[TCG profiler not compiled]\n");
> -}
> -
> -HumanReadableText *qmp_x_query_opcount(Error **errp)
> -{
> - g_autoptr(GString) buf = g_string_new("");
> -
> - if (!tcg_enabled()) {
> - error_setg(errp,
> - "Opcode count information is only available with
> accel=tcg");
> - return NULL;
> - }
> -
> - tcg_dump_op_count(buf);
> -
> - return human_readable_text_from_str(buf);
> -}
> -
> static void hmp_tcg_register(void)
> {
> monitor_register_hmp_info_hrt("jit", qmp_x_query_jit);
> - monitor_register_hmp_info_hrt("opcount", qmp_x_query_opcount);
> }
>
> type_init(hmp_tcg_register);
> diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
> index 040d042810b..cf718761861 100644
> --- a/tests/qtest/qmp-cmd-test.c
> +++ b/tests/qtest/qmp-cmd-test.c
> @@ -51,7 +51,6 @@ static int query_error_class(const char *cmd)
> { "x-query-usb", ERROR_CLASS_GENERIC_ERROR },
> /* Only valid with accel=tcg */
> { "x-query-jit", ERROR_CLASS_GENERIC_ERROR },
> - { "x-query-opcount", ERROR_CLASS_GENERIC_ERROR },
> { "xen-event-list", ERROR_CLASS_GENERIC_ERROR },
> { NULL, -1 }
> };
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index 639a450ee51..d7979222752 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -256,20 +256,6 @@ SRST
> Show dynamic compiler info.
> ERST
>
> -#if defined(CONFIG_TCG)
> - {
> - .name = "opcount",
> - .args_type = "",
> - .params = "",
> - .help = "show dynamic compiler opcode counters",
> - },
> -#endif
> -
> -SRST
> - ``info opcount``
> - Show dynamic compiler opcode counters
> -ERST
> -
> {
> .name = "sync-profile",
> .args_type = "mean:-m,no_coalesce:-n,max:i?",
> --
> 2.49.0
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
