[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] acpi: make build_madt() more generic.
From: |
Gerd Hoffmann |
Subject: |
[PATCH 2/6] acpi: make build_madt() more generic. |
Date: |
Fri, 27 Mar 2020 13:11:07 +0100 |
Remove PCMachineState dependency from build_madt().
Pass AcpiDeviceIf as separate argument instead of
depending on PCMachineState->acpi_dev.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/acpi-build-pc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build-pc.c b/hw/i386/acpi-build-pc.c
index cad44160ff3a..a9dbf080566b 100644
--- a/hw/i386/acpi-build-pc.c
+++ b/hw/i386/acpi-build-pc.c
@@ -347,14 +347,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;
@@ -2782,7 +2781,8 @@ void acpi_build_pc(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) {
--
2.18.2
- [PATCH 0/6] acpi: i386 tweaks, Gerd Hoffmann, 2020/03/27
- [PATCH 2/6] acpi: make build_madt() more generic.,
Gerd Hoffmann <=
- [PATCH 6/6] acpi: parallel: don't use _STA method, Gerd Hoffmann, 2020/03/27
- [PATCH 1/6] acpi: split hw/i386/acpi-build.c, Gerd Hoffmann, 2020/03/27
- Re: [PATCH 0/6] acpi: i386 tweaks, no-reply, 2020/03/27
- Re: [PATCH 0/6] acpi: i386 tweaks, no-reply, 2020/03/27
- Re: [PATCH 0/6] acpi: i386 tweaks, Michael S. Tsirkin, 2020/03/29