[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/35] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDe
From: |
Igor Mammedov |
Subject: |
[PATCH 07/35] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml |
Date: |
Mon, 16 May 2022 11:25:42 -0400 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/input/pckbd.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 4efdf75620..45c40fe3f3 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -29,7 +29,7 @@
#include "qapi/error.h"
#include "hw/isa/isa.h"
#include "migration/vmstate.h"
-#include "hw/acpi/aml-build.h"
+#include "hw/acpi/acpi_aml_interface.h"
#include "hw/input/ps2.h"
#include "hw/irq.h"
#include "hw/input/i8042.h"
@@ -767,9 +767,9 @@ static void i8042_realizefn(DeviceState *dev, Error **errp)
qemu_register_reset(kbd_reset, s);
}
-static void i8042_build_aml(ISADevice *isadev, Aml *scope)
+static void i8042_build_aml(AcpiDevAmlIf *adev, Aml *scope)
{
- ISAKBDState *isa_s = I8042(isadev);
+ ISAKBDState *isa_s = I8042(adev);
Aml *kbd;
Aml *mou;
Aml *crs;
@@ -807,12 +807,12 @@ static Property i8042_properties[] = {
static void i8042_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);
+ AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);
device_class_set_props(dc, i8042_properties);
dc->realize = i8042_realizefn;
dc->vmsd = &vmstate_kbd_isa;
- isa->build_aml = i8042_build_aml;
+ adevc->build_dev_aml = i8042_build_aml;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
@@ -822,6 +822,10 @@ static const TypeInfo i8042_info = {
.instance_size = sizeof(ISAKBDState),
.instance_init = i8042_initfn,
.class_init = i8042_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ACPI_DEV_AML_IF },
+ { },
+ },
};
static void i8042_register_types(void)
--
2.31.1
- [PATCH 00/35] pc/q35: refactor ISA and SMBUS AML generation, Igor Mammedov, 2022/05/16
- [PATCH 01/35] acpi: add interface to build device specific AML, Igor Mammedov, 2022/05/16
- [PATCH 03/35] acpi: fdc-isa: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Igor Mammedov, 2022/05/16
- [PATCH 02/35] acpi: make isa_build_aml() support AcpiDevAmlIf interface, Igor Mammedov, 2022/05/16
- [PATCH 04/35] acpi: parallel port: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Igor Mammedov, 2022/05/16
- [PATCH 06/35] acpi: mc146818rtc: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Igor Mammedov, 2022/05/16
- [PATCH 05/35] acpi: serial-is: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml, Igor Mammedov, 2022/05/16
- [PATCH 07/35] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml,
Igor Mammedov <=
- [PATCH 08/35] isa-bus: drop no longer used ISADeviceClass::build_aml, Igor Mammedov, 2022/05/16
- [PATCH 10/35] tests: acpi: q35: add test for smbus-ipmi device, Igor Mammedov, 2022/05/16
- [PATCH 12/35] tests: acpi: whitelist DSDT.ipmismbus expected blob, Igor Mammedov, 2022/05/16
- [PATCH 13/35] ipmi: acpi: use relative path to resource source, Igor Mammedov, 2022/05/16
- [PATCH 11/35] tests: acpi: update expected blob DSDT.ipmismbus, Igor Mammedov, 2022/05/16
- [PATCH 14/35] tests: acpi: update expected DSDT.ipmismbus blob, Igor Mammedov, 2022/05/16
- [PATCH 15/35] acpi: ich9-smb: add support for AcpiDevAmlIf interface, Igor Mammedov, 2022/05/16
- [PATCH 19/35] acpi: pc: isa bridge: use AcpiDevAmlIf interface to build ISA device descriptors, Igor Mammedov, 2022/05/16
- [PATCH 16/35] acpi: ipmi: use AcpiDevAmlIf interface to build IPMI device descriptors, Igor Mammedov, 2022/05/16
- [PATCH 17/35] q35: acpi: drop not needed PCMachineClass::do_not_add_smb_acpi, Igor Mammedov, 2022/05/16