mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace: Remove deprecated 'vcpu' field from QMP trace events

Browse Source 
'vcpu' fields are deprecated since commit 5485e52a33
("qapi: make the vcpu parameters deprecated for 8.1"),
time to remove them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20240530071548.20074-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-05-30 08:59:30 +02:00
parent 0f910b8724
commit 7ffc4894a6
5 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/about/deprecated.rst
View File

@ -148,17 +148,6 @@ accepted incorrect commands will return an error. Users should make sure that
all arguments passed to ``device_add`` are consistent with the documented
property types.
QEMU Machine Protocol (QMP) events
----------------------------------
``vcpu`` trace events (since 8.1)
'''''''''''''''''''''''''''''''''
The ability to instrument QEMU helper functions with vCPU-aware trace
points was removed in 7.0. However QMP still exposed the vcpu
parameter. This argument has now been deprecated and the remaining
remaining trace points that used it are selected just by name.
Host Architectures
------------------

6
docs/about/removed-features.rst
View File

@ -679,6 +679,12 @@ QEMU Machine Protocol (QMP) events
MEM_UNPLUG_ERROR has been replaced by the more generic ``DEVICE_UNPLUG_GUEST_ERROR`` event.
``vcpu`` trace events (removed in 9.1)
''''''''''''''''''''''''''''''''''''''
The ability to instrument QEMU helper functions with vCPU-aware trace
points was removed in 7.0.
Human Monitor Protocol (HMP) commands
-------------------------------------

27
qapi/trace.json
View File

@ -35,17 +35,10 @@
#
# @state: Tracing state.
#
# @vcpu: Whether this is a per-vCPU event (since 2.7).
#
# Features:
#
# @deprecated: Member @vcpu is deprecated, and always ignored.
#
# Since: 2.2
##
{ 'struct': 'TraceEventInfo',
'data': {'name': 'str', 'state': 'TraceEventState',
'vcpu': { 'type': 'bool', 'features': ['deprecated'] } } }
'data': {'name': 'str', 'state': 'TraceEventState' } }
##
# @trace-event-get-state:
@ -54,12 +47,6 @@
#
# @name: Event name pattern (case-sensitive glob).
#
# @vcpu: The vCPU to query (since 2.7).
#
# Features:
#
# @deprecated: Member @vcpu is deprecated, and always ignored.
#
# Returns: a list of @TraceEventInfo for the matching events
#
# Since: 2.2
@ -71,8 +58,7 @@
# <- { "return": [ { "name": "qemu_memalign", "state": "disabled", "vcpu": false } ] }
##
{ 'command': 'trace-event-get-state',
'data': {'name': 'str',
'*vcpu': {'type': 'int', 'features': ['deprecated'] } },
'data': {'name': 'str' },
'returns': ['TraceEventInfo'] }
##
@ -86,12 +72,6 @@
#
# @ignore-unavailable: Do not match unavailable events with @name.
#
# @vcpu: The vCPU to act upon (all by default; since 2.7).
#
# Features:
#
# @deprecated: Member @vcpu is deprecated, and always ignored.
#
# Since: 2.2
#
# Example:
@ -101,5 +81,4 @@
# <- { "return": {} }
##
{ 'command': 'trace-event-set-state',
'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool',
'*vcpu': {'type': 'int', 'features': ['deprecated'] } } }
'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool' } }

2
trace/qmp.c
View File

@ -48,7 +48,6 @@ static bool check_events(bool ignore_unavailable, bool is_pattern,
}
TraceEventInfoList *qmp_trace_event_get_state(const char *name,
bool has_vcpu, int64_t vcpu,
Error **errp)
{
TraceEventInfoList *events = NULL;
@ -86,7 +85,6 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
void qmp_trace_event_set_state(const char *name, bool enable,
bool has_ignore_unavailable, bool ignore_unavailable,
bool has_vcpu, int64_t vcpu,
Error **errp)
{
TraceEventIter iter;

4
trace/trace-hmp-cmds.c
View File

@ -40,7 +40,7 @@ void hmp_trace_event(Monitor *mon, const QDict *qdict)
Error *local_err = NULL;
qmp_trace_event_set_state(tp_name, new_state,
true, true, false, 0, &local_err);
true, true, &local_err);
if (local_err) {
error_report_err(local_err);
}
@ -82,7 +82,7 @@ void hmp_info_trace_events(Monitor *mon, const QDict *qdict)
name = "*";
}
events = qmp_trace_event_get_state(name, false, 0, &local_err);
events = qmp_trace_event_get_state(name, &local_err);
if (local_err) {
error_report_err(local_err);
return;