From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiNuD-0002U1-NI for qemu-devel@nongnu.org; Thu, 08 May 2014 08:58:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiNu7-0000hf-JB for qemu-devel@nongnu.org; Thu, 08 May 2014 08:58:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiNu7-0000hW-Bs for qemu-devel@nongnu.org; Thu, 08 May 2014 08:58:27 -0400 From: Marcel Apfelbaum Date: Thu, 8 May 2014 15:58:40 +0300 Message-Id: <1399553920-3358-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel.a@redhat.com, aliguori@amazon.com, mst@redhat.com A wrong offset was added to the tables pointed by RSDT if the HPET table is not present. Signed-off-by: Marcel Apfelbaum --- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c98df88..d65fab0 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1417,8 +1417,8 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) 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); if (misc.has_hpet) { + acpi_add_table(table_offsets, tables->table_data); build_hpet(tables->table_data, tables->linker); } if (guest_info->numa_nodes) { -- 1.8.3.1