From patchwork Thu Mar 27 15:35:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 334368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 09A1A14008D for ; Fri, 28 Mar 2014 02:36:54 +1100 (EST) Received: from localhost ([::1]:54371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTCMN-00067N-Qb for incoming@patchwork.ozlabs.org; Thu, 27 Mar 2014 11:36:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTCLv-0005mW-70 for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:36:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTCLp-0005Sa-59 for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:36:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTCLo-0005ST-SP for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:36:17 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2RFZENd032270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 Mar 2014 11:35:15 -0400 Received: from localhost.localdomain.com (vpn1-7-191.ams2.redhat.com [10.36.7.191]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2RFZBRt023193; Thu, 27 Mar 2014 11:35:11 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 27 Mar 2014 17:35:36 +0200 Message-Id: <1395934536-11888-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@amazon.com, mst@redhat.com Subject: [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges 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 Commit 8dcf525abc5dff785251a881f9764dd961065c0d appended description for all occupied non hotpluggable PCI slots. However the bridge devices are already added to SSDT, adding them again will create an incorrect SSDT table. Fixed by skipping the pci bridge devices, marking them as 'system'. Signed-off-by: Marcel Apfelbaum --- hw/i386/acpi-build.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7ecfd70..60abb57 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -841,7 +841,8 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state) pc = PCI_DEVICE_GET_CLASS(pdev); dc = DEVICE_GET_CLASS(pdev); - if (pc->class_id == PCI_CLASS_BRIDGE_ISA) { + if (pc->class_id == PCI_CLASS_BRIDGE_ISA || + pc->is_bridge) { /* DSDT or SSDT above */ set_bit(slot, slot_device_system); }