ACPI_PM_PROP_SCI_INT can be updated to use object_class_property_add_uint8_ptr() with OBJ_PROP_FLAG_READ, whilst ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP can be updated to use object_class_property_add_uint64_ptr().
Signed-off-by: Mark Cave-Ayland <[email protected]> --- hw/isa/lpc_ich9.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index edf9783ec8..07c9509cf4 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -683,24 +683,11 @@ static void ich9_lpc_initfn(Object *obj) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj); - static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE; - static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; - object_initialize_child(obj, "rtc", &lpc->rtc, TYPE_MC146818_RTC); qdev_init_gpio_out_named(DEVICE(lpc), lpc->gsi, ICH9_GPIO_GSI, IOAPIC_NUM_PINS); - object_property_add_uint8_ptr(obj, ACPI_PM_PROP_SCI_INT, - &lpc->sci_gsi, OBJ_PROP_FLAG_READ); - object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD, - &acpi_enable_cmd, OBJ_PROP_FLAG_READ); - object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD, - &acpi_disable_cmd, OBJ_PROP_FLAG_READ); - object_property_add_uint64_ptr(obj, ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP, - &lpc->smi_negotiated_features, - OBJ_PROP_FLAG_READ); - ich9_pm_reset_properties(&lpc->pm); ich9_pm_add_properties(obj, &lpc->pm); } @@ -888,6 +875,9 @@ static void ich9_lpc_class_init(ObjectClass *klass, const void *data) AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(klass); AcpiDevAmlIfClass *amldevc = ACPI_DEV_AML_IF_CLASS(klass); + static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE; + static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; + set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); device_class_set_legacy_reset(dc, ich9_lpc_reset); k->realize = ich9_lpc_realize; @@ -912,6 +902,23 @@ static void ich9_lpc_class_init(ObjectClass *klass, const void *data) adevc->ospm_status = ich9_pm_ospm_status; adevc->send_event = ich9_send_gpe; amldevc->build_dev_aml = build_ich9_isa_aml; + + object_class_property_add_uint8_ptr(klass, ACPI_PM_PROP_SCI_INT, + offsetof(ICH9LPCState, sci_gsi), + OBJ_PROP_FLAG_READ); + object_class_property_add_uint64_ptr(klass, + ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP, + offsetof(ICH9LPCState, + smi_negotiated_features), + OBJ_PROP_FLAG_READ); + object_class_static_property_add_uint8_ptr(klass, + ACPI_PM_PROP_ACPI_ENABLE_CMD, + &acpi_enable_cmd, + OBJ_PROP_FLAG_READ); + object_class_static_property_add_uint8_ptr(klass, + ACPI_PM_PROP_ACPI_DISABLE_CMD, + &acpi_disable_cmd, + OBJ_PROP_FLAG_READ); } static const TypeInfo ich9_lpc_info = { -- 2.43.0
