From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyGa-00054L-CA for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyGZ-0002Z9-BG for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyGZ-0002Z3-5n for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:15 -0400 Date: Fri, 29 Jul 2016 06:15:11 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-5-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 04/41] hw/acpi: fix a DSDT table issue when a pxb is present. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Marcel Apfelbaum , Igor Mammedov , Laszlo Ersek , Paolo Bonzini , Richard Henderson , Eduardo Habkost From: Marcel Apfelbaum PXBs do not support hotplug so they don't have a PCNT function. Since the PXB's PCI root-bus is a child bus of bus 0, the build_dsdt code will add a call to the corresponding PCNT function. Fix this by skipping the PCNT call for the above case. While at it skip also PCIe child buses. Reported-by: Igor Mammedov Signed-off-by: Marcel Apfelbaum Tested-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 77c40d9..5c0d643 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -600,6 +600,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, QLIST_FOREACH(sec, &bus->child, sibling) { int32_t devfn = sec->parent_dev->devfn; + if (pci_bus_is_root(sec) || pci_bus_is_express(sec)) { + continue; + } + aml_append(method, aml_name("^S%.02X.PCNT", devfn)); } } -- MST