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

acpi: make build_madt() more generic. 



Remove PCMachineState dependency from build_madt().
Pass AcpiDeviceIf as separate argument instead of
depending on PCMachineState->acpi_dev.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20200520132003.9492-6-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9b83bb27

hw/i386/acpi-build.c

+7 −7
Original line number Diff line number Diff line
@@ -366,14 +366,13 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, 
}



static void

build_madt(GArray *table_data, BIOSLinker *linker, PCMachineState *pcms)

build_madt(GArray *table_data, BIOSLinker *linker,

           X86MachineState *x86ms, AcpiDeviceIf *adev)

{

    MachineClass *mc = MACHINE_GET_CLASS(pcms);

    X86MachineState *x86ms = X86_MACHINE(pcms);

    const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(pcms));

    MachineClass *mc = MACHINE_GET_CLASS(x86ms);

    const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));

    int madt_start = table_data->len;

    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(pcms->acpi_dev);

    AcpiDeviceIf *adev = ACPI_DEVICE_IF(pcms->acpi_dev);

    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);

    bool x2apic_mode = false;



    AcpiMultipleApicTable *madt;
@@ -2708,7 +2707,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
    aml_len += tables_blob->len - fadt;



    acpi_add_table(table_offsets, tables_blob);

    build_madt(tables_blob, tables->linker, pcms);

    build_madt(tables_blob, tables->linker, x86ms,

               ACPI_DEVICE_IF(pcms->acpi_dev));



    vmgenid_dev = find_vmgenid_dev();

    if (vmgenid_dev) {