[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/55] acpi: x86: deduplicate HPET AML building
From: |
Michael S. Tsirkin |
Subject: |
[PULL 40/55] acpi: x86: deduplicate HPET AML building |
Date: |
Mon, 10 Oct 2022 13:31:38 -0400 |
From: Igor Mammedov <imammedo@redhat.com>
HPET AML doesn't depend on piix4 nor q35, move code buiding it
to common scope to avoid duplication.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20220701133515.137890-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/acpi-build.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 0355bd3dda..67b532f5a5 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1467,9 +1467,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(sb_scope, dev);
aml_append(dsdt, sb_scope);
- if (misc->has_hpet) {
- build_hpet_aml(dsdt);
- }
build_piix4_isa_bridge(dsdt);
if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
@@ -1515,9 +1512,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dsdt, sb_scope);
- if (misc->has_hpet) {
- build_hpet_aml(dsdt);
- }
build_q35_isa_bridge(dsdt);
if (pm->pcihp_bridge_en) {
build_x86_acpi_pci_hotplug(dsdt, pm->pcihp_io_base);
@@ -1528,6 +1522,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
}
}
+ if (misc->has_hpet) {
+ build_hpet_aml(dsdt);
+ }
+
if (vmbus_bridge) {
sb_scope = aml_scope("_SB");
aml_append(sb_scope, build_vmbus_device_aml(vmbus_bridge));
--
MST
- [PULL 31/55] qmp: add QMP command x-query-virtio-status, (continued)
- [PULL 31/55] qmp: add QMP command x-query-virtio-status, Michael S. Tsirkin, 2022/10/10
- [PULL 30/55] qmp: add QMP command x-query-virtio, Michael S. Tsirkin, 2022/10/10
- [PULL 33/55] qmp: add QMP commands for virtio/vhost queue-status, Michael S. Tsirkin, 2022/10/10
- [PULL 32/55] qmp: decode feature & status bits in virtio-status, Michael S. Tsirkin, 2022/10/10
- [PULL 34/55] qmp: add QMP command x-query-virtio-queue-element, Michael S. Tsirkin, 2022/10/10
- [PULL 35/55] hmp: add virtio commands, Michael S. Tsirkin, 2022/10/10
- [PULL 36/55] pci: Remove unused pci_get_*_by_mask() functions, Michael S. Tsirkin, 2022/10/10
- [PULL 37/55] pci: Sanity check mask argument to pci_set_*_by_mask(), Michael S. Tsirkin, 2022/10/10
- [PULL 38/55] hw/smbios: support for type 8 (port connector), Michael S. Tsirkin, 2022/10/10
- [PULL 39/55] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move, Michael S. Tsirkin, 2022/10/10
- [PULL 40/55] acpi: x86: deduplicate HPET AML building,
Michael S. Tsirkin <=
- [PULL 41/55] tests: acpi: update expected blobs after HPET move, Michael S. Tsirkin, 2022/10/10
- [PULL 43/55] acpi: x86: refactor PDSM method to reduce nesting, Michael S. Tsirkin, 2022/10/10
- [PULL 42/55] tests: acpi: whitelist pc/q35 DSDT due to HPET AML move, Michael S. Tsirkin, 2022/10/10
- [PULL 44/55] x86: acpi: _DSM: use Package to pass parameters, Michael S. Tsirkin, 2022/10/10
- [PULL 45/55] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/10/10
- [PULL 46/55] tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN, Michael S. Tsirkin, 2022/10/10
- [PULL 47/55] x86: acpi: cleanup PCI device _DSM duplication, Michael S. Tsirkin, 2022/10/10
- [PULL 48/55] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/10/10
- [PULL 49/55] tests: acpi: whitelist pc/q35 DSDT before moving _ADR field, Michael S. Tsirkin, 2022/10/10
- [PULL 51/55] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/10/10