ACPI_PM_PROP_PM_IO_BASE can be converted to use object_class_property_add_uint32_ptr(). Remove the now unused piix4_pm_add_properties() function.
Signed-off-by: Mark Cave-Ayland <[email protected]> Reviewed-by: Marc-André Lureau <[email protected]> --- hw/acpi/piix4.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 6462ba970c..52bd61667f 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -405,12 +405,6 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) (memory_region_present(io_as, 0x2f8) ? 0x90 : 0); } -static void piix4_pm_add_properties(PIIX4PMState *s) -{ - object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, - &s->io_base, OBJ_PROP_FLAG_READ); -} - static void piix4_pm_add_class_properties(ObjectClass *oc) { static const uint8_t acpi_enable_cmd = ACPI_ENABLE; @@ -439,6 +433,10 @@ static void piix4_pm_add_class_properties(ObjectClass *oc) ACPI_PM_PROP_SCI_INT, &sci_int, OBJ_PROP_FLAG_READ); + object_class_property_add_uint32_ptr(oc, + ACPI_PM_PROP_PM_IO_BASE, + offsetof(PIIX4PMState, io_base), + OBJ_PROP_FLAG_READ); } static void piix4_pm_realize(PCIDevice *dev, Error **errp) @@ -494,8 +492,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) piix4_acpi_system_hot_add_init(pci_address_space_io(dev), pci_get_bus(dev), s); - - piix4_pm_add_properties(s); } static void piix4_pm_init(Object *obj) -- 2.43.0
