Re: [PATCH v3 06/10] trace: remove code that depends on setting vcpu

[Philippe Mathieu-Daudé]

On 5/5/23 17:53, Alex Bennée wrote:
> Now we no longer have any events that are for vcpus we can start
> excising the code from the trace control. As the vcpu parameter is
> encoded as part of QMP we just stub out the has_vcpu/vcpu parameters
> rather than alter the API.
>
> Message-Id: <20230420150009.1675181-7-alex.bennee@linaro.org>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20230503091756.1453057-7-alex.bennee@linaro.org>
> ---
>   trace/control-internal.h |  10 ----
>   trace/control-vcpu.h     |  16 ------
>   trace/control.h          |  48 -----------------
>   hw/core/cpu-common.c     |   2 -
>   stubs/trace-control.c    |  13 -----
>   trace/control-target.c   | 110 ++++-----------------------------------
>   trace/control.c          |  16 ------
>   trace/qmp.c              |  74 +++-----------------------
>   trace/trace-hmp-cmds.c   |  17 +-----
>   9 files changed, 19 insertions(+), 287 deletions(-)


> diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c
> index 792876c34a..1d07672cb2 100644
> --- a/trace/trace-hmp-cmds.c
> +++ b/trace/trace-hmp-cmds.c
> @@ -37,16 +37,9 @@ void hmp_trace_event(Monitor *mon, const QDict *qdict)
>   {
>       const char *tp_name = qdict_get_str(qdict, "name");
>       bool new_state = qdict_get_bool(qdict, "option");
> -    bool has_vcpu = qdict_haskey(qdict, "vcpu");
> -    int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
>       Error *local_err = NULL;
>   
> -    if (vcpu < 0) {
> -        monitor_printf(mon, "argument vcpu must be positive");
> -        return;
> -    }
> -
> -    qmp_trace_event_set_state(tp_name, new_state, true, true, has_vcpu, vcpu, 
> &local_err);
> +    qmp_trace_event_set_state(tp_name, new_state, true, true, false, 0, 
> &local_err);
>       if (local_err) {
>           error_report_err(local_err);
>       }
> @@ -80,8 +73,6 @@ void hmp_trace_file(Monitor *mon, const QDict *qdict)
>   void hmp_info_trace_events(Monitor *mon, const QDict *qdict)
>   {
>       const char *name = qdict_get_try_str(qdict, "name");
> -    bool has_vcpu = qdict_haskey(qdict, "vcpu");
> -    int vcpu = qdict_get_try_int(qdict, "vcpu", 0);
>       TraceEventInfoList *events;
>       TraceEventInfoList *elem;
>       Error *local_err = NULL;
> @@ -89,12 +80,8 @@ void hmp_info_trace_events(Monitor *mon, const QDict *qdict)
>       if (name == NULL) {
>           name = "*";
>       }
> -    if (vcpu < 0) {
> -        monitor_printf(mon, "argument vcpu must be positive");
> -        return;
> -    }
>   
> -    events = qmp_trace_event_get_state(name, has_vcpu, vcpu, &local_err);
> +    events = qmp_trace_event_get_state(name, false, 0, &local_err);
>       if (local_err) {
>           error_report_err(local_err);
>           return;

We can simplify further by removing 'bool has_vcpu, int64_t vcpu' from
qmp_trace_event_set_state/qmp_trace_event_get_state, which are now
always false/0.