[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/12] hw/i386/pc_piix: create PIIX4_PM device directly instead o
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 10/12] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn() |
Date: |
Sat, 28 May 2022 10:19:32 +0100 |
Now that all external logic has been removed from piix4_pm_initfn() the PIIX4_PM
device can be instantiated directly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/i386/pc_piix.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 82696fc707..4120fd52e5 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,6 +47,7 @@
#include "hw/xen/xen-x86.h"
#include "exec/memory.h"
#include "hw/acpi/acpi.h"
+#include "hw/acpi/piix4.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/xen.h"
@@ -281,12 +282,16 @@ static void pc_init1(MachineState *machine,
}
if (pcmc->pci_enabled && x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {
- PIIX4PMState *piix4_pm;
+ PCIDevice *piix4_pm;
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
/* TODO: Populate SPD eeprom data. */
- piix4_pm = piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100,
- x86_machine_is_smm_enabled(x86ms));
+ piix4_pm = pci_new(piix3_devfn + 3, TYPE_PIIX4_PM);
+ qdev_prop_set_uint32(DEVICE(piix4_pm), "smb_io_base", 0xb100);
+ qdev_prop_set_bit(DEVICE(piix4_pm), "smm-enabled",
+ x86_machine_is_smm_enabled(x86ms));
+ pci_realize_and_unref(piix4_pm, pci_bus, &error_fatal);
+
qdev_connect_gpio_out(DEVICE(piix4_pm), 0, x86ms->gsi[9]);
qdev_connect_gpio_out_named(DEVICE(piix4_pm), "smi-irq", 0, smi_irq);
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"));
--
2.20.1
- [PATCH 00/12] hw/acpi/piix4: remove legacy piix4_pm_init() function, Mark Cave-Ayland, 2022/05/28
- [PATCH 06/12] hw/acpi/piix4: rename piix4_pm_init() to piix4_pm_initfn(), Mark Cave-Ayland, 2022/05/28
- [PATCH 10/12] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn(),
Mark Cave-Ayland <=
- [PATCH 12/12] hw/acpi/piix4: remove unused piix4_pm_initfn() function, Mark Cave-Ayland, 2022/05/28
- [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