commit c99cb18eeb8bca145ee260a507ccce6775a6d260
author Marcel Apfelbaum <marcel@redhat.com> Sun Jul 17 19:53:11 2016 +0300
committer Michael S. Tsirkin <mst@redhat.com> Fri Jul 29 00:07:09 2016 +0300
tree de202a442b1820b8a545df7dddeddb0b9013b3c8
parent 7b346c742cd95816c1d5badcc88e18bb95ace08c

hw/acpi: fix a DSDT table issue when a pxb is present.

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 <imammedo@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

hw/i386/acpi-build.c

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 @@
         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));
         }
     }