[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/54] acpi: mc146818rtc: replace ISADeviceClass::build_aml with A
From: |
Michael S. Tsirkin |
Subject: |
[PULL 06/54] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml |
Date: |
Fri, 10 Jun 2022 03:57:19 -0400 |
From: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20220608135340.3304695-7-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/rtc/mc146818rtc.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index f235c2ddbe..ef9765bb8f 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -26,7 +26,7 @@
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/bcd.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
@@ -1017,9 +1017,9 @@ static void rtc_reset_hold(Object *obj)
qemu_irq_lower(s->irq);
}
-static void rtc_build_aml(ISADevice *isadev, Aml *scope)
+static void rtc_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- RTCState *s = MC146818_RTC(isadev);
+ RTCState *s = MC146818_RTC(adev);
Aml *dev;
Aml *crs;
@@ -1043,13 +1043,13 @@ static void rtc_class_initfn(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
dc->realize = rtc_realizefn;
dc->vmsd = &vmstate_rtc;
rc->phases.enter = rtc_reset_enter;
rc->phases.hold = rtc_reset_hold;
- isa->build_aml = rtc_build_aml;
+ adevc->build_dev_aml = rtc_build_aml;
device_class_set_props(dc, mc146818rtc_properties);
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
}
@@ -1059,6 +1059,10 @@ static const TypeInfo mc146818rtc_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(RTCState),
.class_init = rtc_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void mc146818rtc_register_types(void)
--
MST
- [PULL 00/54] virtio,pc,pci: fixes,cleanups,features, Michael S. Tsirkin, 2022/06/10
- [PULL 01/54] acpi: add interface to build device specific AML, Michael S. Tsirkin, 2022/06/10
- [PULL 02/54] acpi: make isa_build_aml() support AcpiDevAmlIf interface, Michael S. Tsirkin, 2022/06/10
- [PULL 03/54] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 04/54] acpi: parallel port: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 05/54] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 07/54] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 08/54] isa-bus: drop no longer used ISADeviceClass::build_aml, Michael S. Tsirkin, 2022/06/10
- [PULL 06/54] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml,
Michael S. Tsirkin <=
- [PULL 11/54] tests: acpi: update expected blob DSDT.ipmismbus, Michael S. Tsirkin, 2022/06/10
- [PULL 09/54] tests: acpi: add and whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 10/54] tests: acpi: q35: add test for smbus-ipmi device, Michael S. Tsirkin, 2022/06/10
- [PULL 12/54] tests: acpi: whitelist DSDT.ipmismbus expected blob, Michael S. Tsirkin, 2022/06/10
- [PULL 13/54] ipmi: acpi: use relative path to resource source, Michael S. Tsirkin, 2022/06/10
- [PULL 14/54] tests: acpi: update expected DSDT.ipmismbus blob, Michael S. Tsirkin, 2022/06/10
- [PULL 15/54] acpi: ich9-smb: add support for AcpiDevAmlIf interface, Michael S. Tsirkin, 2022/06/10
- [PULL 16/54] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors, Michael S. Tsirkin, 2022/06/10
- [PULL 17/54] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi, Michael S. Tsirkin, 2022/06/10
- [PULL 18/54] tests: acpi: white-list to be re-factored pc/q35 DSDT, Michael S. Tsirkin, 2022/06/10