OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

acpi-build: skip hotplugged bridges 

hotplugged bridges don't get bsel allocated so acpi hotplug doesn't work
for them anyway.  OTOH adding them in ACPI creates a host of problems,
e.g. they can't be hot-unplugged themselves which is surprising to
users.

So let's just skip these.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2015-01-28 18:30:38 +02:00
parent ef546f1275
commit a20275fa50
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/acpi-build.c
View File

@ -699,8 +699,10 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
/*
* Skip bridge subtree creation if bridge hotplug is disabled
* to make acpi tables compatible with legacy machine types.
* Skip creation for hotplugged bridges as well.
*/
if (!child->pcihp_bridge_en && bus->parent_dev) {
if (bus->parent_dev && (!child->pcihp_bridge_en ||
DEVICE(bus->parent_dev)->hotplugged)) {
build_free_array(bus_table);
build_pci_bus_state_cleanup(child);
g_free(child);
@ -757,8 +759,10 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
/* When hotplug for bridges is enabled, bridges are
* described in ACPI separately (see build_pci_bus_end).
* In this case they aren't themselves hot-pluggable.
* Hotplugged bridges *are* hot-pluggable.
*/
bridge_in_acpi = pc->is_bridge && child->pcihp_bridge_en;
bridge_in_acpi = pc->is_bridge && child->pcihp_bridge_en &&
!DEVICE(pdev)->hotplugged;
if (pc->class_id == PCI_CLASS_BRIDGE_ISA || bridge_in_acpi) {
set_bit(slot, slot_device_system);