[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 45/53] acpi: arm: virt: build_dsdt: use acpi_init_table()/acpi_ta
From: |
Igor Mammedov |
Subject: |
[PATCH 45/53] acpi: arm: virt: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header() |
Date: |
Fri, 25 Jun 2021 05:18:10 -0400 |
it replaces error-prone pointer arithmetic for build_header() API,
with 2 calls to start and finish table creation,
which hides offsets magic from API user.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: peter.maydell@linaro.org
CC: shannon.zhaosl@gmail.com
CC: qemu-arm@nongnu.org
CC: drjones@redhat.com
---
hw/arm/virt-acpi-build.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index dd8011a670..d15e67a39b 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -636,10 +636,11 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
MachineState *ms = MACHINE(vms);
const MemMapEntry *memmap = vms->memmap;
const int *irqmap = vms->irqmap;
+ AcpiTable table = { .sig = "DSDT", .rev = 2, .oem_id = vms->oem_id,
+ .oem_table_id = vms->oem_table_id };
+ acpi_init_table(&table, table_data);
dsdt = init_aml_allocator();
- /* Reserve space for header */
- acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
/* When booting the VM with UEFI, UEFI takes ownership of the RTC hardware.
* While UEFI can use libfdt to disable the RTC device node in the DTB that
@@ -686,12 +687,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
aml_append(dsdt, scope);
- /* copy AML table into ACPI tables blob and patch header there */
+ /* copy AML table into ACPI tables blob */
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
- build_header(linker, table_data,
- (void *)(table_data->data + table_data->len - dsdt->buf->len),
- "DSDT", dsdt->buf->len, 2, vms->oem_id,
- vms->oem_table_id);
+
+ acpi_table_composed(linker, &table);
free_aml_allocator();
}
--
2.27.0
- [PATCH 35/53] acpi: use build_append_int_noprefix() API to compose SRAT table, (continued)
- [PATCH 35/53] acpi: use build_append_int_noprefix() API to compose SRAT table, Igor Mammedov, 2021/06/25
- [PATCH 37/53] acpi: build_waet: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 39/53] acpi: madt: arm/x86: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 38/53] acpi: build_amd_iommu: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 43/53] acpi: arm/virt: madt: use build_append_int_noprefix() API to compose MADT table, Igor Mammedov, 2021/06/25
- [PATCH 41/53] acpi: x86: set enabled when composing _MAT entries, Igor Mammedov, 2021/06/25
- [PATCH 44/53] acpi: build_dsdt_microvm: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 42/53] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table, Igor Mammedov, 2021/06/25
- [PATCH 36/53] acpi: build_dmar_q35: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 40/53] acpi: x86: remove dead code, Igor Mammedov, 2021/06/25
- [PATCH 45/53] acpi: arm: virt: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(),
Igor Mammedov <=
- [PATCH 46/53] acpi: arm: virt: build_iort: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 48/53] acpi: arm/virt: build_spcr: fix invalid cast, Igor Mammedov, 2021/06/25
- [PATCH 47/53] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API, Igor Mammedov, 2021/06/25
- [PATCH 49/53] acpi: arm/virt: build_spcr: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 50/53] acpi: arm/virt: build_gtdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 51/53] acpi: build_facs: use build_append_int_noprefix() API to compose table, Igor Mammedov, 2021/06/25
- [PATCH 52/53] acpi: remove no longer used build_header(), Igor Mammedov, 2021/06/25
- [PATCH 53/53] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute, Igor Mammedov, 2021/06/25