From patchwork Thu May 8 12:58:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 347038 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BAF91400A8 for ; Thu, 8 May 2014 22:59:03 +1000 (EST) Received: from localhost ([::1]:46668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiNuf-000359-7k for incoming@patchwork.ozlabs.org; Thu, 08 May 2014 08:59:01 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s48CwPIF011860 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 May 2014 08:58:25 -0400 Received: from localhost.localdomain.com (vpn1-5-78.ams2.redhat.com [10.36.5.78]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s48CwNDU005676; Thu, 8 May 2014 08:58:23 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 8 May 2014 15:58:40 +0300 Message-Id: <1399553920-3358-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: marcel.a@redhat.com, aliguori@amazon.com, mst@redhat.com Subject: [Qemu-devel] [PATCH] apci: fix ACPI tables for -no-hpet option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A wrong offset was added to the tables pointed by RSDT if the HPET table is not present. Signed-off-by: Marcel Apfelbaum Reviewed-By: Igor Mammedov --- 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) {