[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 4/9] hw/acpi: implement madt_sub[ACPI_APIC_IO]
From: |
Wei Yang |
Subject: |
[Qemu-devel] [RFC PATCH 4/9] hw/acpi: implement madt_sub[ACPI_APIC_IO] |
Date: |
Mon, 13 May 2019 14:19:08 +0800 |
Signed-off-by: Wei Yang <address@hidden>
---
hw/i386/acpi-build.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4b480efff9..a661fff51d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -339,9 +339,22 @@ static void pc_madt_x2apic_entry(GArray *entry, void
*opaque)
}
}
+static void pc_madt_io_entry(GArray *entry, void *opaque)
+{
+ AcpiMadtIoApic *io_apic;
+
+ io_apic = acpi_data_push(entry, sizeof *io_apic);
+ io_apic->type = ACPI_APIC_IO;
+ io_apic->length = sizeof(*io_apic);
+ io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
+ io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
+ io_apic->interrupt = cpu_to_le32(0);
+}
+
madt_operations i386_madt_sub = {
[ACPI_APIC_PROCESSOR] = pc_madt_apic_entry,
[ACPI_APIC_LOCAL_X2APIC] = pc_madt_x2apic_entry,
+ [ACPI_APIC_IO] = pc_madt_io_entry,
};
static void
@@ -355,7 +368,6 @@ build_madt(GArray *table_data, BIOSLinker *linker,
PCMachineState *pcms)
bool x2apic_mode = false;
AcpiMultipleApicTable *madt;
- AcpiMadtIoApic *io_apic;
AcpiMadtIntsrcovr *intsrcovr;
int i;
@@ -376,12 +388,7 @@ build_madt(GArray *table_data, BIOSLinker *linker,
PCMachineState *pcms)
}
}
- io_apic = acpi_data_push(table_data, sizeof *io_apic);
- io_apic->type = ACPI_APIC_IO;
- io_apic->length = sizeof(*io_apic);
- io_apic->io_apic_id = ACPI_BUILD_IOAPIC_ID;
- io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS);
- io_apic->interrupt = cpu_to_le32(0);
+ adevc->madt_sub[ACPI_APIC_IO](table_data, NULL);
if (pcms->apic_xrupt_override) {
intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr);
--
2.19.1
- [Qemu-devel] [RFC PATCH 0/9] hw/acpi: make build_madt arch agnostic, Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 1/9] hw/acpi: expand pc_madt_cpu_entry in place, Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 2/9] hw/acpi: implement madt_sub[ACPI_APIC_PROCESSOR], Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 3/9] hw/acpi: implement madt_sub[ACPI_APIC_LOCAL_X2APIC], Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 9/9] hw/acpi: implement madt_main to manipulate main madt table, Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 8/9] hw/acpi: factor build_madt with madt_input, Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 7/9] hw/acpi: implement madt_sub[ACPI_APIC_LOCAL_NMI], Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 4/9] hw/acpi: implement madt_sub[ACPI_APIC_IO],
Wei Yang <=
- [Qemu-devel] [RFC PATCH 6/9] hw/acpi: implement madt_sub[ACPI_APIC_LOCAL_X2APIC_NMI], Wei Yang, 2019/05/13
- [Qemu-devel] [RFC PATCH 5/9] hw/acpi: implement madt_sub[ACPI_APIC_XRUPT_OVERRIDE], Wei Yang, 2019/05/13