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 v3 3/3] acpi: i386: Move VMBus DSDT entry to SB
Date: Thu, 18 Jun 2020 06:00:27 +0300 [thread overview]
Message-ID: <20200618030027.759594-4-arilou@gmail.com> (raw)
In-Reply-To: <20200618030027.759594-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 6d9df38e31..38be9e5a58 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1092,7 +1092,6 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
static void build_isa_devices_aml(Aml *table)
{
ISADevice *fdc = pc_find_fdc0();
- VMBusBridge *vmbus_bridge = vmbus_bridge_find();
bool ambiguous;
Aml *scope = aml_scope("_SB.PCI0.ISA");
@@ -1113,10 +1112,6 @@ static void build_isa_devices_aml(Aml *table)
isa_build_aml(ISA_BUS(obj), scope);
}
- if (vmbus_bridge) {
- aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
- }
-
aml_append(table, scope);
}
@@ -1661,6 +1656,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();
@@ -1675,6 +1671,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
aml_append(dev, aml_name_decl("_UID", aml_int(1)));
aml_append(sb_scope, dev);
+ if (vmbus_bridge) {
+ aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
+ }
aml_append(dsdt, sb_scope);
build_hpet_aml(dsdt);
@@ -1692,6 +1691,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dev, aml_name_decl("_UID", aml_int(1)));
aml_append(dev, build_q35_osc_method());
aml_append(sb_scope, dev);
+ if (vmbus_bridge) {
+ aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
+ }
aml_append(dsdt, sb_scope);
build_hpet_aml(dsdt);
--
2.24.1
next prev parent reply other threads:[~2020-06-18 3:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 3:00 [PATCH v3 0/3] hyperv: vmbus: ACPI various corrections Jon Doron
2020-06-18 3:00 ` [PATCH v3 1/3] hyperv: vmbus: Remove the 2nd IRQ Jon Doron
2020-06-23 14:58 ` Igor Mammedov
2020-06-18 3:00 ` [PATCH v3 2/3] i386: acpi: vmbus: Add _ADR definition Jon Doron
2020-06-23 15:06 ` Igor Mammedov
2020-06-25 2:23 ` Jon Doron
2020-06-18 3:00 ` Jon Doron [this message]
2020-06-23 15:09 ` [PATCH v3 3/3] acpi: i386: Move VMBus DSDT entry to SB Igor Mammedov
2020-06-25 2:25 ` Jon Doron
2020-06-25 4:46 ` Jon Doron
2020-06-25 18:39 ` Igor Mammedov
2020-06-18 3:23 ` [PATCH v3 0/3] hyperv: vmbus: ACPI various corrections no-reply
2020-06-23 15:11 ` Igor Mammedov
2020-06-23 15:45 ` 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=20200618030027.759594-4-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).