| Message ID | 20210712194339.813152-8-danielhb413@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DEVICE_UNPLUG_ERROR QAPI event | expand |
On Mon, 12 Jul 2021 16:43:39 -0300 Daniel Henrique Barboza <danielhb413@gmail.com> wrote: > MEM_UNPLUG_ERROR is deprecated since the introduction of > DEVICE_UNPLUG_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> > Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/acpi/memory_hotplug.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index e37acb0367..a0772fe083 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" > @@ -181,10 +182,19 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, > > trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector); > > + /* > + * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_ERROR > + * while the deprecation of MEM_UNPLUG_ERROR is > + * pending. > + */ > if (dev->id) { > qapi_event_send_mem_unplug_error(dev->id, error_pretty); > } > > + qapi_event_send_device_unplug_error(!!dev->id, dev->id, > + dev->canonical_path, > + true, error_pretty); > + > error_free(local_err); > break; > }
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index e37acb0367..a0772fe083 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" @@ -181,10 +182,19 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, trace_mhp_acpi_pc_dimm_delete_failed(mem_st->selector); + /* + * Send both MEM_UNPLUG_ERROR and DEVICE_UNPLUG_ERROR + * while the deprecation of MEM_UNPLUG_ERROR is + * pending. + */ if (dev->id) { qapi_event_send_mem_unplug_error(dev->id, error_pretty); } + qapi_event_send_device_unplug_error(!!dev->id, dev->id, + dev->canonical_path, + true, error_pretty); + error_free(local_err); break; }
MEM_UNPLUG_ERROR is deprecated since the introduction of DEVICE_UNPLUG_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> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- hw/acpi/memory_hotplug.c | 10 ++++++++++ 1 file changed, 10 insertions(+)