[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/11] acpi: fix tables for no-hpet configuration
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 03/11] acpi: fix tables for no-hpet configuration |
Date: |
Wed, 7 May 2014 19:16:57 +0300 |
acpi build tried to add offset of hpet table to rsdt even when hpet was
disabled. If no tables follow hpet, this could lead to a malformed
rsdt.
Fix it up.
To avoid such errors in the future, rearrange code slightly to make it
clear that acpi_add_table stores the offset of the following table - not
of the previous one.
Reported-by: TeLeMan <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Cc: address@hidden
---
hw/i386/acpi-build.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 1ef8ca9..9fac589 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1416,15 +1416,16 @@ void acpi_build(PcGuestInfo *guest_info,
AcpiBuildTables *tables)
/* ACPI tables pointed to by RSDT */
acpi_add_table(table_offsets, tables->table_data);
build_fadt(tables->table_data, tables->linker, &pm, facs, dsdt);
- acpi_add_table(table_offsets, tables->table_data);
+ acpi_add_table(table_offsets, tables->table_data);
build_ssdt(tables->table_data, tables->linker, &cpu, &pm, &misc, &pci,
guest_info);
- acpi_add_table(table_offsets, tables->table_data);
- build_madt(tables->table_data, tables->linker, &cpu, guest_info);
acpi_add_table(table_offsets, tables->table_data);
+ build_madt(tables->table_data, tables->linker, &cpu, guest_info);
+
if (misc.has_hpet) {
+ acpi_add_table(table_offsets, tables->table_data);
build_hpet(tables->table_data, tables->linker);
}
if (guest_info->numa_nodes) {
--
MST
- [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 01/11] acpi/pcihp.c: Rewrite acpi_pcihp_get_bsel using object_property_get_int, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 02/11] acpi-build: properly decrement objects' reference counters, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 03/11] acpi: fix tables for no-hpet configuration,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 05/11] pc: add compat_props placeholder for 2.0 machine type, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 04/11] i8259: don't abort when trying to use level sensitive irqs, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 07/11] smbus: allow returning an error from reads, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 06/11] apic: use emulated lapic version 0x14 on pc machines >= 2.1, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 08/11] smbus: return -1 if nothing found at the given address, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 09/11] pm_smbus: correctly report unclaimed cycles, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 10/11] MAINTAINERS: addresses for responsible disclosure, Michael S. Tsirkin, 2014/05/07
- [Qemu-devel] [PULL v2 11/11] configure: make source tree build more robust, Michael S. Tsirkin, 2014/05/07
- Re: [Qemu-devel] [PULL v2 00/11] pc,net,MAINTAINERS,build updates, Peter Maydell, 2014/05/07