If the machine has several root busses, we need to add them to acpi in order to be properly detected by guests.
Signed-off-by: Marcel Apfelbaum marcel@redhat.com --- hw/i386/acpi-build.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index e7db85d..fedcb2e 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -60,6 +60,8 @@ #include "qom/qom-qobject.h" #include "exec/ram_addr.h"
+#include "qmp-commands.h" + /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows * a little bit, there should be plenty of free space since the DSDT @@ -661,6 +663,36 @@ build_ssdt(AcpiAml *table_aml, GArray *linker, ssdt = acpi_def_block("SSDT", 1, ACPI_BUILD_APPNAME6, ACPI_BUILD_APPNAME4, 1);
+ { + PciInfoList *info_list, *info; + Error *err = NULL; + + info_list = qmp_query_pci(&err); + if (err) { + error_free(err); + return; + } + + for (info = info_list; info; info = info->next) { + PciInfo *bus_info = info->value; + + if (bus_info->bus == 0) { + continue; + } + + scope = acpi_scope("\_SB"); + dev = acpi_device("PC%.02X", (uint8_t)bus_info->bus); + aml_append(&dev, acpi_name_decl("_UID", + acpi_string("PC%.02X", (uint8_t)bus_info->bus))); + aml_append(&dev, acpi_name_decl("_HID", acpi_string("PNP0A03"))); + aml_append(&dev, + acpi_name_decl("_BBN", acpi_int((uint8_t)bus_info->bus))); + aml_append(&scope, dev); + aml_append(&ssdt, scope); + } + qapi_free_PciInfoList(info_list); + } + scope = acpi_scope("\_SB.PCI0"); /* build PCI0._CRS */ crs = acpi_resource_template();