On Wed, 20 May 2020 15:19:53 +0200
Gerd Hoffmann <kra...@redhat.com> wrote:
> Allow reuse for microvm.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> include/hw/acpi/generic_event_device.h | 1 +
> hw/acpi/generic_event_device.c | 8 ++++++++
> hw/arm/virt-acpi-build.c | 8 --------
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/include/hw/acpi/generic_event_device.h
> b/include/hw/acpi/generic_event_device.h
> index 9687cb524258..ebed1ffe4231 100644
> --- a/include/hw/acpi/generic_event_device.h
> +++ b/include/hw/acpi/generic_event_device.h
> @@ -113,5 +113,6 @@ typedef struct AcpiGedState {
>
> void build_ged_aml(Aml *table, const char* name, HotplugHandler *hotplug_dev,
> uint32_t ged_irq, AmlRegionSpace rs, hwaddr ged_base);
> +void acpi_dsdt_add_power_button(Aml *scope);
>
> #endif
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index 3072fb4ab32b..cde50da5b3ca 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -142,6 +142,14 @@ void build_ged_aml(Aml *table, const char *name,
> HotplugHandler *hotplug_dev,
> aml_append(table, dev);
> }
>
> +void acpi_dsdt_add_power_button(Aml *scope)
> +{
> + Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
> + aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C0C")));
> + aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> + aml_append(scope, dev);
> +}
> +
> /* Memory read by the GED _EVT AML dynamic method */
> static uint64_t ged_evt_read(void *opaque, hwaddr addr, unsigned size)
> {
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 1b0a584c7b62..49eacc622219 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -354,14 +354,6 @@ static void acpi_dsdt_add_gpio(Aml *scope, const
> MemMapEntry *gpio_memmap,
> aml_append(scope, dev);
> }
>
> -static void acpi_dsdt_add_power_button(Aml *scope)
> -{
> - Aml *dev = aml_device(ACPI_POWER_BUTTON_DEVICE);
> - aml_append(dev, aml_name_decl("_HID", aml_string("PNP0C0C")));
> - aml_append(dev, aml_name_decl("_UID", aml_int(0)));
> - aml_append(scope, dev);
> -}
> -
> static void
> build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> {
