[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/13] acpi: Don't use find_i440fx() when setting bs
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 11/13] acpi: Don't use find_i440fx() when setting bsel properties |
Date: |
Wed, 2 Dec 2015 20:22:56 -0200 |
Instead of checking for i440fx, the code can simply check if the
machine has ACPI PCI hotplug enabled.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/acpi-build.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 585100f..048967e 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -397,12 +397,12 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque)
return bsel_alloc;
}
-static void acpi_set_pci_info(void)
+static void acpi_set_pci_info(PCMachineState *pcms)
{
- PCIBus *bus = find_i440fx(); /* TODO: Q35 support */
+ PCIBus *bus = pcms->bus;
unsigned bsel_alloc = 0;
- if (bus) {
+ if (acpi_pci_hotplug_enabled(pcms) && bus) {
/* Scan all PCI buses. Set property to enable acpi based hotplug. */
pci_for_each_bus_depth_first(bus, acpi_set_bsel, NULL, &bsel_alloc);
}
@@ -1855,7 +1855,7 @@ void acpi_setup(PCMachineState *pcms)
build_state->pcms = pcms;
- acpi_set_pci_info();
+ acpi_set_pci_info(pcms);
acpi_build_tables_init(&tables);
acpi_build(build_state->pcms, &tables);
--
2.1.0
- Re: [Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field, (continued)
- [Qemu-devel] [PATCH 04/13] acpi: Move DSDT info to PCMachineClass, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 05/13] acpi: Simplify s3/s4 property querying, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 06/13] acpi: Use &error_abort when getting PCI hotplug properties, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 07/13] acpi: Use QOM property to get CPU hotplug I/O base, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 08/13] acpi: Always try to init PCI hotplug I/O base, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 10/13] acpi: Change acpi_pci_hotplug_enabled() argument to PCMachineState, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 09/13] acpi: Use PCMachineState::acpi_dev to get ACPI dev, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 12/13] intel_iommu.h: Missing sysbus.h include, Eduardo Habkost, 2015/12/03
- [Qemu-devel] [PATCH 11/13] acpi: Don't use find_i440fx() when setting bsel properties,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 13/13] acpi: Don't include q35 and piix headers, Eduardo Habkost, 2015/12/03
- Re: [Qemu-devel] [PATCH 00/13] acpi: Make piix-specific and q35-specific code generic, Igor Mammedov, 2015/12/03