hw/acpi/ich9: move initial property values into ich9_reset_properties()
Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Message-ID: <20260703135512.3213964-7-mark.caveayland@nutanix.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Mark Cave-Ayland committed
Jul 3, 2026 at 14:53 UTC
29b6fe5aeb7217880b0b91ed9e539491fd28fd92
3 files changed
+9
-2
hw/acpi/ich9.c
+6
-2
@@ -388,9 +388,8 @@ static void ich9_pm_set_keep_pci_slot_hpc(Object *obj, bool value, Error **errp)
388
s->pm.keep_pci_slot_hpc = value;
389
}
390
391
-void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
391
+void ich9_pm_reset_properties(ICH9LPCPMRegs *pm)
392
{
393
- static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
393
pm->acpi_memory_hotplug.is_enabled = true;
394
pm->disable_s3 = 0;
395
pm->disable_s4 = 0;
@@ -398,6 +397,11 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
397
pm->acpi_pci_hotplug.use_acpi_hotplug_bridge = true;
398
pm->keep_pci_slot_hpc = true;
399
pm->enable_tco = true;
400
+}
401
+
402
+void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
403
+{
404
+ static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
405
406
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
407
&pm->pm_io_base, OBJ_PROP_FLAG_READ);
hw/isa/lpc_ich9.c
+1
@@ -701,6 +701,7 @@ static void ich9_lpc_initfn(Object *obj)
701
&lpc->smi_negotiated_features,
702
OBJ_PROP_FLAG_READ);
703
704
+ ich9_pm_reset_properties(&lpc->pm);
705
ich9_pm_add_properties(obj, &lpc->pm);
706
}
707
include/hw/acpi/ich9.h
+2
@@ -81,6 +81,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_irq sci_irq);
81
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
82
extern const VMStateDescription vmstate_ich9_pm;
83
84
+void ich9_pm_reset_properties(ICH9LPCPMRegs *pm);
85
+
86
void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm);
87
88
void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,