[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/12] hw/acpi/piix4: introduce piix4_pm_init() instance init fun
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 07/12] hw/acpi/piix4: introduce piix4_pm_init() instance init function |
Date: |
Sat, 28 May 2022 10:19:29 +0100 |
Use the new piix4_pm_init() instance init function to initialise 2 separate qdev
gpios for the SCI and SMI IRQs.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/acpi/piix4.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index d897d2dee6..454fa34df1 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -497,6 +497,14 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
piix4_pm_add_properties(s);
}
+static void piix4_pm_init(Object *obj)
+{
+ PIIX4PMState *s = PIIX4_PM(obj);
+
+ qdev_init_gpio_out(DEVICE(obj), &s->irq, 1);
+ qdev_init_gpio_out_named(DEVICE(obj), &s->smi_irq, "smi-irq", 1);
+}
+
PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq,
int smm_enabled)
@@ -663,6 +671,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void
*data)
static const TypeInfo piix4_pm_info = {
.name = TYPE_PIIX4_PM,
.parent = TYPE_PCI_DEVICE,
+ .instance_init = piix4_pm_init,
.instance_size = sizeof(PIIX4PMState),
.class_init = piix4_pm_class_init,
.interfaces = (InterfaceInfo[]) {
--
2.20.1
- [PATCH 01/12] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize(), (continued)
- [PATCH 01/12] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize(), Mark Cave-Ayland, 2022/05/28
- [PATCH 02/12] hw/acpi/piix4: change smm_enabled from int to bool, Mark Cave-Ayland, 2022/05/28
- [PATCH 03/12] hw/acpi/piix4: convert smm_enabled bool to qdev property, Mark Cave-Ayland, 2022/05/28
- [PATCH 11/12] hw/isa/piix4.c: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Mark Cave-Ayland, 2022/05/28
- [PATCH 08/12] hw/acpi/piix4: use qdev gpio to wire up sci_irq, Mark Cave-Ayland, 2022/05/28
- [PATCH 09/12] hw/acpi/piix4: use qdev gpio to wire up smi_irq, Mark Cave-Ayland, 2022/05/28
- [PATCH 07/12] hw/acpi/piix4: introduce piix4_pm_init() instance init function,
Mark Cave-Ayland <=
- [PATCH 05/12] hw/acpi/piix4: alter piix4_pm_init() to return PIIX4PMState, Mark Cave-Ayland, 2022/05/28
- [PATCH 04/12] hw/acpi/piix4: move PIIX4PMState into separate piix4.h header, Mark Cave-Ayland, 2022/05/28
- Re: [PATCH 00/12] hw/acpi/piix4: remove legacy piix4_pm_init() function, Philippe Mathieu-Daudé, 2022/05/29