Commit a53e581e authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

acpi: add ISADeviceClass->build_aml() 



Also add isa_aml_build() function which walks all isa devices.
This allows to move aml builder code to isa devices.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20200429140003.7336-6-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 88b3648f

hw/i386/acpi-build.c

+1 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,7 @@ static void build_isa_devices_aml(Aml *table) 
        error_report("No ISA bus, unable to define IPMI ACPI data");

    } else {

        build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");

        isa_build_aml(ISA_BUS(obj), scope);

    }



    aml_append(table, scope);

hw/isa/isa-bus.c

+15 −0
Original line number Diff line number Diff line
@@ -207,6 +207,21 @@ ISADevice *isa_vga_init(ISABus *bus) 
    }

}



void isa_build_aml(ISABus *bus, Aml *scope)

{

    BusChild *kid;

    ISADevice *dev;

    ISADeviceClass *dc;



    QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) {

        dev = ISA_DEVICE(kid->child);

        dc = ISA_DEVICE_GET_CLASS(dev);

        if (dc->build_aml) {

            dc->build_aml(dev, scope);

        }

    }

}



static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)

{

    ISADevice *d = ISA_DEVICE(dev);

include/hw/isa/isa.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ typedef struct IsaDmaClass { 


typedef struct ISADeviceClass {

    DeviceClass parent_class;

    void (*build_aml)(ISADevice *dev, Aml *scope);

} ISADeviceClass;



struct ISABus {
@@ -107,6 +108,7 @@ ISADevice *isa_try_create(ISABus *bus, const char *name); 
ISADevice *isa_create_simple(ISABus *bus, const char *name);



ISADevice *isa_vga_init(ISABus *bus);

void isa_build_aml(ISABus *bus, Aml *scope);



/**

 * isa_register_ioport: Install an I/O port region on the ISA bus.