[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/53] acpi: x86: build_dsdt: use acpi_init_table()/acpi_table_co
From: |
Igor Mammedov |
Subject: |
[PATCH 31/53] acpi: x86: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header() |
Date: |
Fri, 25 Jun 2021 05:17:56 -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: marcel.apfelbaum@gmail.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 796ffc6f5c..538af9d944 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1380,12 +1380,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
#endif
int i;
VMBusBridge *vmbus_bridge = vmbus_bridge_find();
+ AcpiTable table = { .sig = "DSDT", .rev = 1, .oem_id = x86ms->oem_id,
+ .oem_table_id = x86ms->oem_table_id };
+ acpi_init_table(&table, table_data);
dsdt = init_aml_allocator();
- /* Reserve space for header */
- acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
-
build_dbg_aml(dsdt);
if (misc->is_piix4) {
sb_scope = aml_scope("_SB");
@@ -1816,9 +1816,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
/* copy AML table into ACPI tables blob and patch header there */
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, 1, x86ms->oem_id,
x86ms->oem_table_id);
+ acpi_table_composed(linker, &table);
free_aml_allocator();
}
--
2.27.0
- [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), (continued)
- [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 22/53] acpi: build_slit: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 23/53] acpi: build_fadt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 21/53] acpi: build_xsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 26/53] acpi: build_mcfg: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 25/53] acpi: acpi_build_hest: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 24/53] acpi: build_tpm2: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 28/53] acpi: nvdimm_build_nfit: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 29/53] acpi: nvdimm_build_ssdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 31/53] acpi: x86: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(),
Igor Mammedov <=
- [PATCH 30/53] acpi: vmgenid_build_acpi: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 27/53] acpi: build_hmat: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 32/53] acpi: build_hpet: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 33/53] acpi: build_tpm_tcpa: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 34/53] acpi: arm/x86: build_srat: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 35/53] acpi: use build_append_int_noprefix() API to compose SRAT table, Igor Mammedov, 2021/06/25