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

["Alex Bennée" <alex.bennee@linaro.org>]

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 5/5/23 17:53, Alex Bennée wrote:
<snip>
>> --- 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.

Isn't qmp_trace_event_get_state generated by the headers?

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro