diff options
| author | Jon Doron | 2020-07-15 10:43:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-09-30 19:09:20 +0200 |
| commit | 8f814ea1a2769311c71af069210dbba1de3aa9a4 (patch) | |
| tree | 1a1463cefb614069364c443ea4055af5fe1ce569 /hw/i386 | |
| parent | vhost-scsi: support inflight io track (diff) | |
| download | qemu-8f814ea1a2769311c71af069210dbba1de3aa9a4.tar.gz qemu-8f814ea1a2769311c71af069210dbba1de3aa9a4.tar.xz qemu-8f814ea1a2769311c71af069210dbba1de3aa9a4.zip | |
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>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/acpi-build.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 8d14e4667a..45ad2f9533 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -990,7 +990,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge) static void build_isa_devices_aml(Aml *table) { - VMBusBridge *vmbus_bridge = vmbus_bridge_find(); bool ambiguous; Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); Aml *scope; @@ -1001,10 +1000,6 @@ static void build_isa_devices_aml(Aml *table) build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); isa_build_aml(ISA_BUS(obj), scope); - if (vmbus_bridge) { - aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); - } - aml_append(table, scope); } @@ -1500,6 +1495,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, PCIBus *bus = NULL; TPMIf *tpm = tpm_find(); int i; + VMBusBridge *vmbus_bridge = vmbus_bridge_find(); 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) { build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); } else { |