ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/acpi: Remove the deprecated QAPI MEM_UNPLUG_ERROR event 

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>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20240530071548.20074-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-05-30 08:53:47 +02:00
parent a7d8244be9
commit 0f910b8724
5 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/about/deprecated.rst
View File

@ -151,11 +151,6 @@ property types.
QEMU Machine Protocol (QMP) events 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) ``vcpu`` trace events (since 8.1)
''''''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''''''

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

@ -671,6 +671,15 @@ Use ``multifd-channels`` instead.
Use ``multifd-compression`` 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 Human Monitor Protocol (HMP) commands
------------------------------------- -------------------------------------

8
hw/acpi/memory_hotplug.c
View File

@ -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); hotplug_handler_unplug(hotplug_ctrl, dev, &local_err);
if (local_err) { if (local_err) {
trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector); 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, qapi_event_send_device_unplug_guest_error(dev->id,
dev->canonical_path); dev->canonical_path);
error_free(local_err); error_free(local_err);

11
hw/ppc/spapr.c
View File

@ -3786,7 +3786,6 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
SpaprDrc *drc; SpaprDrc *drc;
uint32_t nr_lmbs; uint32_t nr_lmbs;
uint64_t size, addr_start, addr; uint64_t size, addr_start, addr;
g_autofree char *qapi_error = NULL;
int i; int i;
if (!dev) { if (!dev) {
@ -3823,16 +3822,8 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
/* /*
* Tell QAPI that something happened and the memory * Tell QAPI that something happened and the memory
* hotunplug wasn't successful. Keep sending * hotunplug wasn't successful.
* MEM_UNPLUG_ERROR even while sending
* DEVICE_UNPLUG_GUEST_ERROR until the deprecation of
* MEM_UNPLUG_ERROR is due.
*/ */
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, qapi_event_send_device_unplug_guest_error(dev->id,
dev->canonical_path); dev->canonical_path);
} }

28
qapi/machine.json
View File

@ -1607,34 +1607,6 @@
{ 'event': 'MEMORY_DEVICE_SIZE_CHANGE', { 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
'data': { '*id': 'str', 'size': 'size', 'qom-path' : 'str'} } '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: # @BootConfiguration:
# #