From: Jon Doron <arilou@gmail.com>
To: qemu-devel@nongnu.org
Cc: mail@maciej.szmigiero.name, Jon Doron <arilou@gmail.com>,
rvkagan@yandex-team.ru, imammedo@redhat.com, pbonzini@redhat.com,
vkuznets@redhat.com
Subject: [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB
Date: Wed, 15 Jul 2020 11:43:25 +0300 [thread overview]
Message-ID: <20200715084326.678715-2-arilou@gmail.com> (raw)
In-Reply-To: <20200715084326.678715-1-arilou@gmail.com>
Signed-off-by: Jon Doron <arilou@gmail.com>
---
hw/i386/acpi-build.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b7bcbbbb2a..7708a27f70 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -975,7 +975,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;
@@ -986,10 +985,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);
}
@@ -1485,6 +1480,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();
@@ -1526,6 +1522,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 {
--
2.24.1
next prev parent reply other threads:[~2020-07-15 8:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 8:43 [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Jon Doron
2020-07-15 8:43 ` Jon Doron [this message]
2020-07-15 13:51 ` [PATCH v5 1/2] acpi: i386: Move VMBus DSDT entry to SB Igor Mammedov
2020-07-15 8:43 ` [PATCH v5 2/2] hw: hyperv: vmbus: Fix 32bit compilation Jon Doron
2020-07-25 12:16 ` Aleksandar Markovic
2020-07-29 14:15 ` Igor Mammedov
2020-09-06 10:14 ` Philippe Mathieu-Daudé
2020-09-09 13:56 ` Laurent Vivier
2020-09-09 16:18 ` Richard Henderson
2020-09-09 16:30 ` Laurent Vivier
2020-09-12 6:26 ` [PATCH v5 0/2] hyperv: vmbus: ACPI various corrections Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200715084326.678715-2-arilou@gmail.com \
--to=arilou@gmail.com \
--cc=imammedo@redhat.com \
--cc=mail@maciej.szmigiero.name \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rvkagan@yandex-team.ru \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).