On Wed, 20 May 2020 15:19:50 +0200
Gerd Hoffmann <kra...@redhat.com> wrote:
> Rename memory region and callbacks and ops to carry "evt" in the name
> because a second region will be added shortly.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Igor Mammedow <imamm...@redhat.com>
> ---
> include/hw/acpi/generic_event_device.h | 2 +-
> hw/acpi/generic_event_device.c | 16 ++++++++--------
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/include/hw/acpi/generic_event_device.h
> b/include/hw/acpi/generic_event_device.h index
> 83917de02425..90a9180db572 100644 ---
> a/include/hw/acpi/generic_event_device.h +++
> b/include/hw/acpi/generic_event_device.h @@ -86,7 +86,7 @@
> #define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4
>
> typedef struct GEDState {
> - MemoryRegion io;
> + MemoryRegion evt;
> uint32_t sel;
> } GEDState;
>
> diff --git a/hw/acpi/generic_event_device.c
> b/hw/acpi/generic_event_device.c index b1cbdd86b66c..1cb34111e59a
> 100644 --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -142,7 +142,7 @@ void build_ged_aml(Aml *table, const char *name,
> HotplugHandler *hotplug_dev, }
>
> /* Memory read by the GED _EVT AML dynamic method */
> -static uint64_t ged_read(void *opaque, hwaddr addr, unsigned size)
> +static uint64_t ged_evt_read(void *opaque, hwaddr addr, unsigned
> size) {
> uint64_t val = 0;
> GEDState *ged_st = opaque;
> @@ -161,14 +161,14 @@ static uint64_t ged_read(void *opaque, hwaddr
> addr, unsigned size) }
>
> /* Nothing is expected to be written to the GED memory region */
> -static void ged_write(void *opaque, hwaddr addr, uint64_t data,
> - unsigned int size)
> +static void ged_evt_write(void *opaque, hwaddr addr, uint64_t data,
> + unsigned int size)
> {
> }
>
> -static const MemoryRegionOps ged_ops = {
> - .read = ged_read,
> - .write = ged_write,
> +static const MemoryRegionOps ged_evt_ops = {
> + .read = ged_evt_read,
> + .write = ged_evt_write,
> .endianness = DEVICE_LITTLE_ENDIAN,
> .valid = {
> .min_access_size = 4,
> @@ -287,9 +287,9 @@ static void acpi_ged_initfn(Object *obj)
> SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
> GEDState *ged_st = &s->ged_state;
>
> - memory_region_init_io(&ged_st->io, obj, &ged_ops, ged_st,
> + memory_region_init_io(&ged_st->evt, obj, &ged_evt_ops, ged_st,
> TYPE_ACPI_GED, ACPI_GED_EVT_SEL_LEN);
> - sysbus_init_mmio(sbd, &ged_st->io);
> + sysbus_init_mmio(sbd, &ged_st->evt);
>
> sysbus_init_irq(sbd, &s->irq);
>
