[PATCH 0/2] qapi: Remove deprecated events

[PATCH 0/2] qapi: Remove deprecated events

[Philippe Mathieu-Daudé]

Remove MEM_UNPLUG_ERROR and 'vcpu' field in TRACE events,
all deprecated since long enough.

Philippe Mathieu-Daudé (2):
  hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event
  trace: Remove deprecated 'vcpu' field from QMP trace events

 docs/about/deprecated.rst       | 16 ----------------
 docs/about/removed-features.rst | 15 +++++++++++++++
 qapi/machine.json               | 28 ----------------------------
 qapi/trace.json                 | 27 +++------------------------
 hw/acpi/memory_hotplug.c        |  8 --------
 hw/ppc/spapr.c                  | 11 +----------
 trace/qmp.c                     |  2 --
 trace/trace-hmp-cmds.c          |  4 ++--
 8 files changed, 21 insertions(+), 90 deletions(-)

-- 
2.41.0

[PATCH 1/2] hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event

[Philippe Mathieu-Daudé]

The MEM_UNPLUG_ERROR event is deprecated since commit d43f1670c7
("qapi/qdev.json: add DEVICE_UNPLUG_GUEST_ERROR QAPI event"),
time to remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 docs/about/deprecated.rst       |  5 -----
 docs/about/removed-features.rst |  9 +++++++++
 qapi/machine.json               | 28 ----------------------------
 hw/acpi/memory_hotplug.c        |  8 --------
 hw/ppc/spapr.c                  | 11 +----------
 5 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 40585ca7d5..4a61894db6 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -151,11 +151,6 @@ property types.
 QEMU Machine Protocol (QMP) events
 ----------------------------------
 
-``MEM_UNPLUG_ERROR`` (since 6.2)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead.
-
 ``vcpu`` trace events (since 8.1)
 '''''''''''''''''''''''''''''''''
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index fba0cfb0b0..f1e70263e2 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -671,6 +671,15 @@ Use ``multifd-channels`` instead.
 
 Use ``multifd-compression`` instead.
 
+QEMU Machine Protocol (QMP) events
+----------------------------------
+
+``MEM_UNPLUG_ERROR`` (removed in 9.1)
+'''''''''''''''''''''''''''''''''''''
+
+MEM_UNPLUG_ERROR has been replaced by the more generic ``DEVICE_UNPLUG_GUEST_ERROR`` event.
+
+
 Human Monitor Protocol (HMP) commands
 -------------------------------------
 
diff --git a/qapi/machine.json b/qapi/machine.json
index bce6e1bbc4..453feb9347 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1607,34 +1607,6 @@
 { 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
   'data': { '*id': 'str', 'size': 'size', 'qom-path' : 'str'} }
 
-##
-# @MEM_UNPLUG_ERROR:
-#
-# Emitted when memory hot unplug error occurs.
-#
-# @device: device name
-#
-# @msg: Informative message
-#
-# Features:
-#
-# @deprecated: This event is deprecated.  Use
-#     @DEVICE_UNPLUG_GUEST_ERROR instead.
-#
-# Since: 2.4
-#
-# Example:
-#
-#     <- { "event": "MEM_UNPLUG_ERROR",
-#          "data": { "device": "dimm1",
-#                    "msg": "acpi: device unplug for unsupported device"
-#          },
-#          "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
-##
-{ 'event': 'MEM_UNPLUG_ERROR',
-  'data': { 'device': 'str', 'msg': 'str' },
-  'features': ['deprecated'] }
-
 ##
 # @BootConfiguration:
 #
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index de6f974ebb..9b974b7274 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -178,14 +178,6 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data,
             hotplug_handler_unplug(hotplug_ctrl, dev, &local_err);
             if (local_err) {
                 trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector);
-
-                /*
-                 * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_GUEST_ERROR
-                 * while the deprecation of MEM_UNPLUG_ERROR is
-                 * pending.
-                 */
-                qapi_event_send_mem_unplug_error(dev->id ? : "",
-                                                 error_get_pretty(local_err));
                 qapi_event_send_device_unplug_guest_error(dev->id,
                                                           dev->canonical_path);
                 error_free(local_err);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 4345764bce..81a187f126 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3786,7 +3786,6 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
     SpaprDrc *drc;
     uint32_t nr_lmbs;
     uint64_t size, addr_start, addr;
-    g_autofree char *qapi_error = NULL;
     int i;
 
     if (!dev) {
@@ -3823,16 +3822,8 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
 
     /*
      * Tell QAPI that something happened and the memory
-     * hotunplug wasn't successful. Keep sending
-     * MEM_UNPLUG_ERROR even while sending
-     * DEVICE_UNPLUG_GUEST_ERROR until the deprecation of
-     * MEM_UNPLUG_ERROR is due.
+     * hotunplug wasn't successful.
      */
-    qapi_error = g_strdup_printf("Memory hotunplug rejected by the guest "
-                                 "for device %s", dev->id);
-
-    qapi_event_send_mem_unplug_error(dev->id ? : "", qapi_error);
-
     qapi_event_send_device_unplug_guest_error(dev->id,
                                               dev->canonical_path);
 }
-- 
2.41.0

[PATCH 2/2] trace: Remove deprecated 'vcpu' field from QMP trace events

[Philippe Mathieu-Daudé]

'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>
---
 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

Re: [PATCH 1/2] hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event

[Harsh Prateek Bora]

On 5/30/24 12:45, Philippe Mathieu-Daudé wrote:
> The MEM_UNPLUG_ERROR event is deprecated since commit d43f1670c7
> ("qapi/qdev.json: add DEVICE_UNPLUG_GUEST_ERROR QAPI event"),
> time to remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   docs/about/deprecated.rst       |  5 -----
>   docs/about/removed-features.rst |  9 +++++++++
>   qapi/machine.json               | 28 ----------------------------
>   hw/acpi/memory_hotplug.c        |  8 --------
>   hw/ppc/spapr.c                  | 11 +----------
>   5 files changed, 10 insertions(+), 51 deletions(-)
> 

For spapr:
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>

> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 40585ca7d5..4a61894db6 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -151,11 +151,6 @@ property types.
>   QEMU Machine Protocol (QMP) events
>   ----------------------------------
>   
> -``MEM_UNPLUG_ERROR`` (since 6.2)
> -''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> -
> -Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead.
> -
>   ``vcpu`` trace events (since 8.1)
>   '''''''''''''''''''''''''''''''''
>   
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
> index fba0cfb0b0..f1e70263e2 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -671,6 +671,15 @@ Use ``multifd-channels`` instead.
>   
>   Use ``multifd-compression`` instead.
>   
> +QEMU Machine Protocol (QMP) events
> +----------------------------------
> +
> +``MEM_UNPLUG_ERROR`` (removed in 9.1)
> +'''''''''''''''''''''''''''''''''''''
> +
> +MEM_UNPLUG_ERROR has been replaced by the more generic ``DEVICE_UNPLUG_GUEST_ERROR`` event.
> +
> +
>   Human Monitor Protocol (HMP) commands
>   -------------------------------------
>   
> diff --git a/qapi/machine.json b/qapi/machine.json
> index bce6e1bbc4..453feb9347 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -1607,34 +1607,6 @@
>   { 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
>     'data': { '*id': 'str', 'size': 'size', 'qom-path' : 'str'} }
>   
> -##
> -# @MEM_UNPLUG_ERROR:
> -#
> -# Emitted when memory hot unplug error occurs.
> -#
> -# @device: device name
> -#
> -# @msg: Informative message
> -#
> -# Features:
> -#
> -# @deprecated: This event is deprecated.  Use
> -#     @DEVICE_UNPLUG_GUEST_ERROR instead.
> -#
> -# Since: 2.4
> -#
> -# Example:
> -#
> -#     <- { "event": "MEM_UNPLUG_ERROR",
> -#          "data": { "device": "dimm1",
> -#                    "msg": "acpi: device unplug for unsupported device"
> -#          },
> -#          "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
> -##
> -{ 'event': 'MEM_UNPLUG_ERROR',
> -  'data': { 'device': 'str', 'msg': 'str' },
> -  'features': ['deprecated'] }
> -
>   ##
>   # @BootConfiguration:
>   #
> diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
> index de6f974ebb..9b974b7274 100644
> --- a/hw/acpi/memory_hotplug.c
> +++ b/hw/acpi/memory_hotplug.c
> @@ -178,14 +178,6 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data,
>               hotplug_handler_unplug(hotplug_ctrl, dev, &local_err);
>               if (local_err) {
>                   trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector);
> -
> -                /*
> -                 * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_GUEST_ERROR
> -                 * while the deprecation of MEM_UNPLUG_ERROR is
> -                 * pending.
> -                 */
> -                qapi_event_send_mem_unplug_error(dev->id ? : "",
> -                                                 error_get_pretty(local_err));
>                   qapi_event_send_device_unplug_guest_error(dev->id,
>                                                             dev->canonical_path);
>                   error_free(local_err);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 4345764bce..81a187f126 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3786,7 +3786,6 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
>       SpaprDrc *drc;
>       uint32_t nr_lmbs;
>       uint64_t size, addr_start, addr;
> -    g_autofree char *qapi_error = NULL;
>       int i;
>   
>       if (!dev) {
> @@ -3823,16 +3822,8 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
>   
>       /*
>        * Tell QAPI that something happened and the memory
> -     * hotunplug wasn't successful. Keep sending
> -     * MEM_UNPLUG_ERROR even while sending
> -     * DEVICE_UNPLUG_GUEST_ERROR until the deprecation of
> -     * MEM_UNPLUG_ERROR is due.
> +     * hotunplug wasn't successful.
>        */
> -    qapi_error = g_strdup_printf("Memory hotunplug rejected by the guest "
> -                                 "for device %s", dev->id);
> -
> -    qapi_event_send_mem_unplug_error(dev->id ? : "", qapi_error);
> -
>       qapi_event_send_device_unplug_guest_error(dev->id,
>                                                 dev->canonical_path);
>   }

Re: [PATCH 0/2] qapi: Remove deprecated events

[Michael S. Tsirkin]

On Thu, May 30, 2024 at 09:15:46AM +0200, Philippe Mathieu-Daudé wrote:
> Remove MEM_UNPLUG_ERROR and 'vcpu' field in TRACE events,
> all deprecated since long enough.
> 
> Philippe Mathieu-Daudé (2):
>   hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event
>   trace: Remove deprecated 'vcpu' field from QMP trace events

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>



>  docs/about/deprecated.rst       | 16 ----------------
>  docs/about/removed-features.rst | 15 +++++++++++++++
>  qapi/machine.json               | 28 ----------------------------
>  qapi/trace.json                 | 27 +++------------------------
>  hw/acpi/memory_hotplug.c        |  8 --------
>  hw/ppc/spapr.c                  | 11 +----------
>  trace/qmp.c                     |  2 --
>  trace/trace-hmp-cmds.c          |  4 ++--
>  8 files changed, 21 insertions(+), 90 deletions(-)
> 
> -- 
> 2.41.0

Re: [PATCH 0/2] qapi: Remove deprecated events

[Markus Armbruster]

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

> Remove MEM_UNPLUG_ERROR and 'vcpu' field in TRACE events,
> all deprecated since long enough.

Thank you!

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Re: [PATCH 0/2] qapi: Remove deprecated events

[Philippe Mathieu-Daudé]

On 30/5/24 09:15, Philippe Mathieu-Daudé wrote:
> Remove MEM_UNPLUG_ERROR and 'vcpu' field in TRACE events,
> all deprecated since long enough.
> 
> Philippe Mathieu-Daudé (2):
>    hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event
>    trace: Remove deprecated 'vcpu' field from QMP trace events

Thanks, series queued.