[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 06/21] acpi: move acpi_dsdt_add_power_button() to ged
From: |
Gerd Hoffmann |
Subject: |
[PATCH v8 06/21] acpi: move acpi_dsdt_add_power_button() to ged |
Date: |
Tue, 15 Sep 2020 14:08:54 +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 241151662b45..ac921e9f0c15 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -120,5 +120,6 @@ 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 9efd7a388150..6bff5e373872 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.27.0
- [PATCH v8 03/21] seabios: add bios-microvm.bin binary, (continued)
- [PATCH v8 03/21] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/09/15
- [PATCH v8 17/21] tests/acpi: allow microvm test data updates., Gerd Hoffmann, 2020/09/15
- [PATCH v8 21/21] microvm: enable ramfb, Gerd Hoffmann, 2020/09/15
- [PATCH v8 20/21] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/09/15
- [PATCH v8 13/21] x86: constify x86_machine_is_*_enabled, Gerd Hoffmann, 2020/09/15
- [PATCH v8 12/21] microvm/acpi: disable virtio-mmio cmdline hack, Gerd Hoffmann, 2020/09/15
- [PATCH v8 08/21] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/09/15
- [PATCH v8 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/09/15
- [PATCH v8 16/21] microvm: wire up hotplug, Gerd Hoffmann, 2020/09/15
- [PATCH v8 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/09/15
- [PATCH v8 06/21] acpi: move acpi_dsdt_add_power_button() to ged,
Gerd Hoffmann <=
- [PATCH v8 11/21] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/09/15
- [PATCH v8 04/21] acpi: ged: add control regs, Gerd Hoffmann, 2020/09/15
- [PATCH v8 07/21] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/09/15