ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/virt-acpi-build: Fix table revision and some comments 

The table revision is not the ACPI spec version. Fix the wrong revision
and also some comments.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1433820378-8336-1-git-send-email-zhaoshenglong@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Shannon Zhao 2015-06-26 14:22:36 +01:00 committed by Peter Maydell
parent ccb0c7e122
commit d0652b5765
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/virt-acpi-build.c
View File

@ -387,7 +387,7 @@ build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
/ PCIE_MMCFG_SIZE_MIN) - 1; / PCIE_MMCFG_SIZE_MIN) - 1;
build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5); build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
} }
/* GTDT */ /* GTDT */
@ -413,7 +413,7 @@ build_gtdt(GArray *table_data, GArray *linker)
build_header(linker, table_data, build_header(linker, table_data,
(void *)(table_data->data + gtdt_start), "GTDT", (void *)(table_data->data + gtdt_start), "GTDT",
table_data->len - gtdt_start, 5); table_data->len - gtdt_start, 2);
} }
/* MADT */ /* MADT */
@ -450,7 +450,7 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info,
build_header(linker, table_data, build_header(linker, table_data,
(void *)(table_data->data + madt_start), "APIC", (void *)(table_data->data + madt_start), "APIC",
table_data->len - madt_start, 5); table_data->len - madt_start, 3);
} }
/* FADT */ /* FADT */
@ -507,7 +507,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len); g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
build_header(linker, table_data, build_header(linker, table_data,
(void *)(table_data->data + table_data->len - dsdt->buf->len), (void *)(table_data->data + table_data->len - dsdt->buf->len),
"DSDT", dsdt->buf->len, 5); "DSDT", dsdt->buf->len, 2);
free_aml_allocator(); free_aml_allocator();
} }
@ -545,6 +545,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
* FADT * FADT
* GTDT * GTDT
* MADT * MADT
* MCFG
* DSDT * DSDT
*/ */
@ -552,7 +553,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
dsdt = tables_blob->len; dsdt = tables_blob->len;
build_dsdt(tables_blob, tables->linker, guest_info); build_dsdt(tables_blob, tables->linker, guest_info);
/* FADT MADT GTDT SPCR pointed to by RSDT */ /* FADT MADT GTDT MCFG SPCR pointed to by RSDT */
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_fadt(tables_blob, tables->linker, dsdt); build_fadt(tables_blob, tables->linker, dsdt);