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

acpi: i386: Move VMBus DSDT entry to SB 

Signed-off-by: Jon Doron <arilou@gmail.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20200715084326.678715-2-arilou@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jon Doron 2020-07-15 11:43:25 +03:00 committed by Paolo Bonzini
parent b82526c7ee
commit 8f814ea1a2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,7 +990,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
static void build_isa_devices_aml(Aml *table) static void build_isa_devices_aml(Aml *table)
{ {
VMBusBridge *vmbus_bridge = vmbus_bridge_find();
bool ambiguous; bool ambiguous;
Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
Aml *scope; Aml *scope;
@ -1001,10 +1000,6 @@ static void build_isa_devices_aml(Aml *table)
build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA");
isa_build_aml(ISA_BUS(obj), scope); isa_build_aml(ISA_BUS(obj), scope);
if (vmbus_bridge) {
aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
}
aml_append(table, scope); aml_append(table, scope);
} }
@ -1500,6 +1495,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
PCIBus *bus = NULL; PCIBus *bus = NULL;
TPMIf *tpm = tpm_find(); TPMIf *tpm = tpm_find();
int i; int i;
VMBusBridge *vmbus_bridge = vmbus_bridge_find();
dsdt = init_aml_allocator(); dsdt = init_aml_allocator();
@ -1569,6 +1565,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
} }
} }
if (vmbus_bridge) {
sb_scope = aml_scope("_SB");
aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
aml_append(dsdt, sb_scope);
}
if (pcmc->legacy_cpu_hotplug) { if (pcmc->legacy_cpu_hotplug) {
build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
} else { } else {