ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acpi: simplify build_isa_devices_aml() 

x86 machines can have a single ISA bus only.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200619091905.21676-9-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Gerd Hoffmann 2020-06-19 11:19:01 +02:00 committed by Michael S. Tsirkin
parent 0575c2fd6d
commit 13371f9bf4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/i386/acpi-build.c
View File

@ -979,18 +979,14 @@ static void build_isa_devices_aml(Aml *table)
{ {
VMBusBridge *vmbus_bridge = vmbus_bridge_find(); VMBusBridge *vmbus_bridge = vmbus_bridge_find();
bool ambiguous; bool ambiguous;
Aml *scope = aml_scope("_SB.PCI0.ISA");
Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
Aml *scope;
if (ambiguous) { assert(obj && !ambiguous);
error_report("Multiple ISA busses, unable to define IPMI ACPI data");
} else if (!obj) { scope = aml_scope("_SB.PCI0.ISA");
error_report("No ISA bus, unable to define IPMI ACPI data"); build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");
} else { isa_build_aml(ISA_BUS(obj), scope);
build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");
isa_build_aml(ISA_BUS(obj), scope);
}
if (vmbus_bridge) { if (vmbus_bridge) {
aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); aml_append(scope, build_vmbus_device_aml(vmbus_bridge));