mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpihp: simplify acpi_pcihp_disable_root_bus

Browse Source 
Get rid of the static variable that keeps track of whether hotplug has been
disabled on the root pci bus. Simply use qbus_is_hotpluggable() api to
perform the same check. This eliminates additional if conditional and
simplifies the function.

Signed-off-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <1640764674-7784-1-git-send-email-ani@anirban.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Ani Sinha 2021-12-29 13:27:53 +05:30 committed by Michael S. Tsirkin
parent c8adb4d222
commit 784802689f
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/acpi/pcihp.c
View File

@ -128,20 +128,15 @@ static void acpi_set_pci_info(void)
static void acpi_pcihp_disable_root_bus(void) static void acpi_pcihp_disable_root_bus(void)
{ {
static bool root_hp_disabled;
Object *host = acpi_get_i386_pci_host(); Object *host = acpi_get_i386_pci_host();
PCIBus *bus; PCIBus *bus;
if (root_hp_disabled) {
return;
}
bus = PCI_HOST_BRIDGE(host)->bus; bus = PCI_HOST_BRIDGE(host)->bus;
if (bus) { if (bus && qbus_is_hotpluggable(BUS(bus))) {
/* setting the hotplug handler to NULL makes the bus non-hotpluggable */ /* setting the hotplug handler to NULL makes the bus non-hotpluggable */
qbus_set_hotplug_handler(BUS(bus), NULL); qbus_set_hotplug_handler(BUS(bus), NULL);
} }
root_hp_disabled = true;
return; return;
} }