SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

memory_hotplug.c: send DEVICE_UNPLUG_GUEST_ERROR in acpi_memory_hotplug_write()

Browse Source 
MEM_UNPLUG_ERROR is deprecated since the introduction of
DEVICE_UNPLUG_GUEST_ERROR. Keep emitting both while the deprecation of
MEM_UNPLUG_ERROR is pending.

CC: Michael S. Tsirkin <mst@redhat.com>
CC: Igor Mammedov <imammedo@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20210907004755.424931-8-danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Daniel Henrique Barboza 2021-09-06 21:47:55 -03:00 committed by David Gibson
parent 4b08cd567b
commit 46f2c282c3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/acpi/memory_hotplug.c
View File

@ -8,6 +8,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-events-acpi.h" #include "qapi/qapi-events-acpi.h"
#include "qapi/qapi-events-machine.h" #include "qapi/qapi-events-machine.h"
#include "qapi/qapi-events-qdev.h"
#define MEMORY_SLOTS_NUMBER "MDNR" #define MEMORY_SLOTS_NUMBER "MDNR"
#define MEMORY_HOTPLUG_IO_REGION "HPMR" #define MEMORY_HOTPLUG_IO_REGION "HPMR"
@ -178,8 +179,16 @@ 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 ? : "", qapi_event_send_mem_unplug_error(dev->id ? : "",
error_get_pretty(local_err)); error_get_pretty(local_err));
qapi_event_send_device_unplug_guest_error(!!dev->id, dev->id,
dev->canonical_path);
error_free(local_err); error_free(local_err);
break; break;
} }