From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIhJF-0006Vz-2V for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIhJE-0000We-6B for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIhJE-0000Wa-0e for qemu-devel@nongnu.org; Thu, 30 Jun 2016 15:07:32 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B22C578225 for ; Thu, 30 Jun 2016 19:07:31 +0000 (UTC) From: Marcel Apfelbaum Date: Thu, 30 Jun 2016 22:07:17 +0300 Message-Id: <1467313640-29605-4-git-send-email-marcel@redhat.com> In-Reply-To: <1467313640-29605-1-git-send-email-marcel@redhat.com> References: <1467313640-29605-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V4 3/6] 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: marcel@redhat.com, mst@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, lersek@redhat.com, ehabkost@redhat.com 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 --- 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 5a594be..675a3dc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -596,6 +596,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)); } } -- 2.4.3