[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/21] acpi: move acpi_dsdt_add_power_button() to ged
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 06/21] acpi: move acpi_dsdt_add_power_button() to ged |
Date: |
Thu, 2 Jul 2020 22:48:44 +0200 |
Allow reuse for microvm.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@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 491df80a5cc7..6df400e1ee16 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 1384a2cf2ab4..852eb6484b0e 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -357,14 +357,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 acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms)
{
PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev);
--
2.18.4
- Re: [PATCH v4 08/21] microvm/acpi: add minimal acpi support, (continued)
[PATCH v4 20/21] tests/acpi: add microvm test, Gerd Hoffmann, 2020/07/02
[PATCH v4 07/21] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/07/02
[PATCH v4 21/21] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/07/02
[PATCH v4 13/21] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/07/02
[PATCH v4 12/21] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/07/02
[PATCH v4 15/21] x86: move cpu plug from pc to x86, Gerd Hoffmann, 2020/07/02
[PATCH v4 06/21] acpi: move acpi_dsdt_add_power_button() to ged,
Gerd Hoffmann <=
[PATCH v4 10/21] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/07/02
[PATCH v4 05/21] acpi: ged: add x86 device variant., Gerd Hoffmann, 2020/07/02
[PATCH v4 18/21] tests/acpi: allow microvm test data updates., Gerd Hoffmann, 2020/07/02
[PATCH v4 11/21] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/07/02
[PATCH v4 17/21] tests/acpi: clear bios-tables-test-allowed-diff.h, Gerd Hoffmann, 2020/07/02
[PATCH v4 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/07/02
Re: [PATCH v4 00/21] microvm: add acpi support, no-reply, 2020/07/02
Re: [PATCH v4 00/21] microvm: add acpi support, no-reply, 2020/07/02