[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 2/2] acpi-build: skip hotplugged bridges
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-stable] [PATCH 2/2] acpi-build: skip hotplugged bridges |
Date: |
Wed, 28 Jan 2015 18:30:38 +0200 |
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 <address@hidden>
---
hw/i386/acpi-build.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 74586f3..ff42de5 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -857,8 +857,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);
@@ -915,8 +917,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);
--
MST