[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/53] pc: acpi: create MADT.lapic entries only for v
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 37/53] pc: acpi: create MADT.lapic entries only for valid lapics |
Date: |
Fri, 11 Mar 2016 17:09:40 +0200 |
From: Igor Mammedov <address@hidden>
do not assume that all lapics in range 0..apic_id_limit
are valid and do not create lapic entries for not
possible lapics in MADT.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
---
hw/i386/acpi-build.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a7aeb2f..e852075 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -362,9 +362,10 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo
*pm,
}
static void
-build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms,
- AcpiCpuInfo *cpu)
+build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms)
{
+ MachineClass *mc = MACHINE_GET_CLASS(pcms);
+ CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(pcms));
int madt_start = table_data->len;
AcpiMultipleApicTable *madt;
@@ -377,18 +378,22 @@ build_madt(GArray *table_data, GArray *linker,
PCMachineState *pcms,
madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
madt->flags = cpu_to_le32(1);
- for (i = 0; i < pcms->apic_id_limit; i++) {
+ for (i = 0; i < apic_ids->len; i++) {
AcpiMadtProcessorApic *apic = acpi_data_push(table_data, sizeof *apic);
+ int apic_id = apic_ids->cpus[i].arch_id;
+
apic->type = ACPI_APIC_PROCESSOR;
apic->length = sizeof(*apic);
- apic->processor_id = i;
- apic->local_apic_id = i;
- if (test_bit(i, cpu->found_cpus)) {
+ apic->processor_id = apic_id;
+ apic->local_apic_id = apic_id;
+ if (apic_ids->cpus[i].cpu != NULL) {
apic->flags = cpu_to_le32(1);
} else {
apic->flags = cpu_to_le32(0);
}
}
+ g_free(apic_ids);
+
io_apic = acpi_data_push(table_data, sizeof *io_apic);
io_apic->type = ACPI_APIC_IO;
io_apic->length = sizeof(*io_apic);
@@ -2717,7 +2722,7 @@ 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, &cpu);
+ build_madt(tables_blob, tables->linker, pcms);
if (misc.has_hpet) {
acpi_add_table(table_offsets, tables_blob);
--
MST
- [Qemu-devel] [PULL 29/53] qemu-char: remove all msgfds on disconnect, (continued)
- [Qemu-devel] [PULL 29/53] qemu-char: remove all msgfds on disconnect, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 28/53] qemu-char: avoid potential double-free, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 31/53] pxb: cleanup, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 30/53] qemu-char: make tcp_chr_disconnect() reentrant-safe, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 32/53] pc: acpi: remove NOP assignment, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 34/53] machine: introduce MachineClass.possible_cpu_arch_ids() hook, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 33/53] pc: init pcms->apic_id_limit once and use it throughout pc.c, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 35/53] pc: acpi: cleanup qdev_get_machine() calls, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 36/53] pc: acpi: SRAT: create only valid processor lapic entries, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 38/53] pc: acpi: create Processor and Notify objects only for valid lapics, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 37/53] pc: acpi: create MADT.lapic entries only for valid lapics,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 39/53] pc: acpi: drop cpu->found_cpus bitmap, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 40/53] pc: acpi: clarify why possible LAPIC entries must be present in MADT, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 41/53] MAINTAINERS: Add an entry for virtio header files, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 42/53] MAINTAINERS: machine core, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 43/53] ipmi: remove IPMI_CHECK_CMD_LEN() macro, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 44/53] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 45/53] ipmi: remove IPMI_CHECK_RESERVATION() macro, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 46/53] ipmi: add rsp_buffer_set_error() helper, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 48/53] ipmi: use a function to initialize the SDR table, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 47/53] ipmi: add a realize function to the device class, Michael S. Tsirkin, 2016/03/11