[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/22] acpi: make build_madt() more generic.
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 05/22] acpi: make build_madt() more generic. |
Date: |
Wed, 20 May 2020 15:19:46 +0200 |
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>
Reviewed-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-build.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1afb47b09ee9..4f6418d60b05 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -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;
@@ -2534,7 +2533,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) {
--
2.18.4
- [PATCH v3 03/22] [testing] seabios: update config & build rules, (continued)
- [PATCH v3 03/22] [testing] seabios: update config & build rules, Gerd Hoffmann, 2020/05/20
- [PATCH v3 02/22] [testing] seabios: update submodule to master snapshot, Gerd Hoffmann, 2020/05/20
- [PATCH v3 07/22] acpi: madt: skip pci override on pci-less systems., Gerd Hoffmann, 2020/05/20
- [PATCH v3 15/22] microvm: make virtio irq base runtime configurable, Gerd Hoffmann, 2020/05/20
- [PATCH v3 08/22] acpi: fadt: add hw-reduced sleep register support, Gerd Hoffmann, 2020/05/20
- [PATCH v3 19/22] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/05/20
- [PATCH v3 06/22] acpi: create acpi-common.c and move madt code, Gerd Hoffmann, 2020/05/20
- [PATCH v3 05/22] acpi: make build_madt() more generic.,
Gerd Hoffmann <=
- [PATCH v3 12/22] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/05/20
- [PATCH v3 18/22] microvm/acpi: use GSI 16-23 for virtio, Gerd Hoffmann, 2020/05/20
- [PATCH v3 17/22] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/05/20
- [PATCH v3 10/22] acpi: ged: add control regs, Gerd Hoffmann, 2020/05/20
- [PATCH v3 14/22] microvm: use 2G split unconditionally, Gerd Hoffmann, 2020/05/20