On Tue, Aug 24, 2021 at 09:48:35PM -0300, Daniel Henrique Barboza wrote: > 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 > CC: Igor Mammedov > Reviewed-by: Greg Kurz > Signed-off-by: Daniel Henrique Barboza Reviewed-by: David Gibson > --- > hw/acpi/memory_hotplug.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index 6a71de408b..d0fffcf787 100644 > --- a/hw/acpi/memory_hotplug.c > +++ b/hw/acpi/memory_hotplug.c > @@ -8,6 +8,7 @@ > #include "qapi/error.h" > #include "qapi/qapi-events-acpi.h" > #include "qapi/qapi-events-machine.h" > +#include "qapi/qapi-events-qdev.h" > > #define MEMORY_SLOTS_NUMBER "MDNR" > #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); > 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->id, > + dev->canonical_path); > error_free(local_err); > break; > } -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson