[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/19] hw/arm: Factor out powerdown notifier from GPIO
From: |
Michael S. Tsirkin |
Subject: |
[PULL 08/19] hw/arm: Factor out powerdown notifier from GPIO |
Date: |
Sat, 5 Oct 2019 17:59:16 -0400 |
From: Shameer Kolothum <address@hidden>
This is in preparation of using GED device for
system_powerdown event. Make the powerdown notifier
registration independent of create_gpio() fn.
Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/arm/virt.c | 12 ++++--------
include/hw/arm/virt.h | 1 +
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d221841c42..dbd8c18f36 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -797,10 +797,6 @@ static void virt_powerdown_req(Notifier *n, void *opaque)
qemu_set_irq(qdev_get_gpio_in(gpio_key_dev, 0), 1);
}
-static Notifier virt_system_powerdown_notifier = {
- .notify = virt_powerdown_req
-};
-
static void create_gpio(const VirtMachineState *vms, qemu_irq *pic)
{
char *nodename;
@@ -841,10 +837,6 @@ static void create_gpio(const VirtMachineState *vms,
qemu_irq *pic)
KEY_POWER);
qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff",
"gpios", phandle, 3, 0);
-
- /* connect powerdown request */
- qemu_register_powerdown_notifier(&virt_system_powerdown_notifier);
-
g_free(nodename);
}
@@ -1737,6 +1729,10 @@ static void machvirt_init(MachineState *machine)
vms->acpi_dev = create_acpi_ged(vms, pic);
}
+ /* connect powerdown request */
+ vms->powerdown_notifier.notify = virt_powerdown_req;
+ qemu_register_powerdown_notifier(&vms->powerdown_notifier);
+
/* Create mmio transports, so the user can create virtio backends
* (which will be automatically plugged in to the transports). If
* no backend is created the transport will just sit harmlessly idle.
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 577ee49b4b..0b41083e9d 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -137,6 +137,7 @@ typedef struct {
int psci_conduit;
hwaddr highest_gpa;
DeviceState *acpi_dev;
+ Notifier powerdown_notifier;
} VirtMachineState;
#define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
--
MST
- [PULL 00/19] virtio, vhost, acpi: features, fixes, tests, Michael S. Tsirkin, 2019/10/05
- [PULL 01/19] vhost-user: save features if the char dev is closed, Michael S. Tsirkin, 2019/10/05
- [PULL 02/19] hw/acpi: Make ACPI IO address space configurable, Michael S. Tsirkin, 2019/10/05
- [PULL 03/19] hw/acpi: Do not create memory hotplug method when handler is not defined, Michael S. Tsirkin, 2019/10/05
- [PULL 04/19] hw/acpi: Add ACPI Generic Event Device Support, Michael S. Tsirkin, 2019/10/05
- [PULL 05/19] hw/arm/virt: Add memory hotplug framework, Michael S. Tsirkin, 2019/10/05
- [PULL 06/19] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot, Michael S. Tsirkin, 2019/10/05
- [PULL 07/19] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Michael S. Tsirkin, 2019/10/05
- [PULL 08/19] hw/arm: Factor out powerdown notifier from GPIO,
Michael S. Tsirkin <=
- [PULL 09/19] hw/arm: Use GED for system_powerdown event, Michael S. Tsirkin, 2019/10/05
- [PULL 10/19] docs/specs: Add ACPI GED documentation, Michael S. Tsirkin, 2019/10/05
- [PULL 11/19] tests: Update ACPI tables list for upcoming arm/virt tests, Michael S. Tsirkin, 2019/10/05
- [PULL 12/19] tests/acpi: add empty files, Michael S. Tsirkin, 2019/10/05
- [PULL 13/19] tests: allow empty expected files, Michael S. Tsirkin, 2019/10/05
- [PULL 14/19] tests: Add bios tests to arm/virt, Michael S. Tsirkin, 2019/10/05
- [PULL 15/19] tests: document how to update acpi tables, Michael S. Tsirkin, 2019/10/05
- [PULL 16/19] tests/acpi: add expected tables for arm/virt, Michael S. Tsirkin, 2019/10/05
- [PULL 17/19] virtio: Add virtio_fs linux headers, Michael S. Tsirkin, 2019/10/05
- [PULL 18/19] virtio: add vhost-user-fs base device, Michael S. Tsirkin, 2019/10/05