From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTCUc-0007sd-Ig for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:45:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTCUW-0000L2-JQ for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:45:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTCUW-0000Kt-BU for qemu-devel@nongnu.org; Thu, 27 Mar 2014 11:45:16 -0400 Date: Thu, 27 Mar 2014 17:45:30 +0200 From: "Michael S. Tsirkin" Message-ID: <20140327154530.GB1713@redhat.com> References: <1395934536-11888-1-git-send-email-marcel.a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1395934536-11888-1-git-send-email-marcel.a@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.0] acpi: Fixed incorrect ACPI generation for pci bridges List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: qemu-devel@nongnu.org, aliguori@amazon.com On Thu, Mar 27, 2014 at 05:35:36PM +0200, Marcel Apfelbaum wrote: > 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 Applied. I tweaked the commit log and comment a bit. > --- > 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); > } > > -- > 1.8.3.1