2:15 a.m.
'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(a)linaro.org>
---
docs/about/deprecated.rst | 11 -----------
docs/about/removed-features.rst | 6 ++++++
qapi/trace.json | 27 +++------------------------
trace/qmp.c | 2 --
trace/trace-hmp-cmds.c | 4 ++--
5 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 4a61894db6..187c8a3f97 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -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
------------------
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index f1e70263e2..1e64c27cd8 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -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
-------------------------------------
diff --git a/qapi/trace.json b/qapi/trace.json
index 043d12f83e..9ebb6d9eaf 100644
--- a/qapi/trace.json
+++ b/qapi/trace.json
@@ -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' } }
diff --git a/trace/qmp.c b/trace/qmp.c
index 3e3971c6a8..074a27b204 100644
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -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;
diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c
index 86211fce27..d38dd600de 100644
--- a/trace/trace-hmp-cmds.c
+++ b/trace/trace-hmp-cmds.c
@@ -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;
--
2.41.0