motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 21:42:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

acpi-build: minor code cleanup

Browse source 
Fix up and add  comments to clarify code, plus a trivial
code change for clarity.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-07-28 22:56:45 +02:00
parent 133a2da488
commit 093a35e5fc
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/i386/acpi-build.c
View file

@ -825,9 +825,9 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
bool bus_hotplug_support = false; bool bus_hotplug_support = false;
/* /*
skip bridge subtree creation if bridge hotplug is disabled * Skip bridge subtree creation if bridge hotplug is disabled
to make it compatible with 1.7 machine type * to make acpi tables compatible with legacy machine types.
*/ */
if (!child->pcihp_bridge_en && bus->parent_dev) { if (!child->pcihp_bridge_en && bus->parent_dev) {
return; return;
} }
@ -869,6 +869,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
PCIDeviceClass *pc; PCIDeviceClass *pc;
PCIDevice *pdev = bus->devices[i]; PCIDevice *pdev = bus->devices[i];
int slot = PCI_SLOT(i); int slot = PCI_SLOT(i);
bool bridge_in_acpi;
if (!pdev) { if (!pdev) {
continue; continue;
@ -878,8 +879,13 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
pc = PCI_DEVICE_GET_CLASS(pdev); pc = PCI_DEVICE_GET_CLASS(pdev);
dc = DEVICE_GET_CLASS(pdev); dc = DEVICE_GET_CLASS(pdev);
if (pc->class_id == PCI_CLASS_BRIDGE_ISA || /* When hotplug for bridges is enabled, bridges are
(pc->is_bridge && child->pcihp_bridge_en)) { * described in ACPI separately (see build_pci_bus_end).
* In this case they aren't themselves hot-pluggable.
*/
bridge_in_acpi = pc->is_bridge && child->pcihp_bridge_en;
if (pc->class_id == PCI_CLASS_BRIDGE_ISA || bridge_in_acpi) {
set_bit(slot, slot_device_system); set_bit(slot, slot_device_system);
} }
@ -891,7 +897,7 @@ static void build_pci_bus_end(PCIBus *bus, void *bus_state)
} }
} }
if (!dc->hotpluggable || (pc->is_bridge && child->pcihp_bridge_en)) { if (!dc->hotpluggable || bridge_in_acpi) {
clear_bit(slot, slot_hotplug_enable); clear_bit(slot, slot_hotplug_enable);
} }
} }