diff options
| author | Marcel Apfelbaum | 2016-07-17 18:53:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2016-07-28 23:07:09 +0200 |
| commit | c99cb18eeb8bca145ee260a507ccce6775a6d260 (patch) | |
| tree | de202a442b1820b8a545df7dddeddb0b9013b3c8 /hw/i386/acpi-build.c | |
| parent | hw/pxb: declare pxb devices as not hot-pluggable (diff) | |
| download | qemu-c99cb18eeb8bca145ee260a507ccce6775a6d260.tar.gz qemu-c99cb18eeb8bca145ee260a507ccce6775a6d260.tar.xz qemu-c99cb18eeb8bca145ee260a507ccce6775a6d260.zip | |
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>
Diffstat (limited to 'hw/i386/acpi-build.c')
| -rw-r--r-- | hw/i386/acpi-build.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 77c40d92e2..5c0d643331 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)); } } |