On Wed, 20 May 2020 15:19:52 +0200 Gerd Hoffmann <kra...@redhat.com> wrote:
> Set AcpiDeviceIfClass->madt_cpu, > otherwise identical to TYPE_ACPI_GED. > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > include/hw/acpi/generic_event_device.h | 4 +++ > hw/i386/generic_event_device_x86.c | 36 ++++++++++++++++++++++++++ > hw/i386/Makefile.objs | 1 + > 3 files changed, 41 insertions(+) > create mode 100644 hw/i386/generic_event_device_x86.c > > diff --git a/include/hw/acpi/generic_event_device.h > b/include/hw/acpi/generic_event_device.h > index 474c92198080..9687cb524258 100644 > --- a/include/hw/acpi/generic_event_device.h > +++ b/include/hw/acpi/generic_event_device.h > @@ -69,6 +69,10 @@ > #define ACPI_GED(obj) \ > OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED) > > +#define TYPE_ACPI_GED_X86 "acpi-ged-x86" > +#define ACPI_GED_X86(obj) \ > + OBJECT_CHECK(AcpiGedX86State, (obj), TYPE_ACPI_GED_X86) > + > #define ACPI_GED_EVT_SEL_OFFSET 0x0 > #define ACPI_GED_EVT_SEL_LEN 0x4 > > diff --git a/hw/i386/generic_event_device_x86.c > b/hw/i386/generic_event_device_x86.c > new file mode 100644 > index 000000000000..e26fb02a2ef6 > --- /dev/null > +++ b/hw/i386/generic_event_device_x86.c > @@ -0,0 +1,36 @@ > +/* > + * x86 variant of the generic event device for hw reduced acpi > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2 or later, as published by the Free Software Foundation. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/acpi/generic_event_device.h" > +#include "hw/i386/pc.h" > + > +static void acpi_ged_x86_class_init(ObjectClass *class, void *data) > +{ > + AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class); > + > + adevc->madt_cpu = pc_madt_cpu_entry; > +} > + > +static const TypeInfo acpi_ged_x86_info = { > + .name = TYPE_ACPI_GED_X86, > + .parent = TYPE_ACPI_GED, > + .class_init = acpi_ged_x86_class_init, > + .interfaces = (InterfaceInfo[]) { > + { TYPE_HOTPLUG_HANDLER }, > + { TYPE_ACPI_DEVICE_IF }, > + { } > + } > +}; > + > +static void acpi_ged_x86_register_types(void) > +{ > + type_register_static(&acpi_ged_x86_info); > +} > + > +type_init(acpi_ged_x86_register_types) > diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs > index 6abc74551a72..622739305882 100644 > --- a/hw/i386/Makefile.objs > +++ b/hw/i386/Makefile.objs > @@ -17,4 +17,5 @@ obj-$(CONFIG_PC) += port92.o > > obj-y += kvmvapic.o > obj-$(CONFIG_ACPI) += acpi-common.o > +obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device_x86.o > obj-$(CONFIG_PC) += acpi-build.o