acpi: x86: build_dsdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
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> Reviewed-by: Eric Auger <eric.auger@redhat.com> Message-Id: <20210924122802.1455362-14-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
b25681c358
commit
5c142bc48f
|
@ -1405,12 +1405,12 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
|
||||||
#endif
|
#endif
|
||||||
int i;
|
int i;
|
||||||
VMBusBridge *vmbus_bridge = vmbus_bridge_find();
|
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_table_begin(&table, table_data);
|
||||||
dsdt = init_aml_allocator();
|
dsdt = init_aml_allocator();
|
||||||
|
|
||||||
/* Reserve space for header */
|
|
||||||
acpi_data_push(dsdt->buf, sizeof(AcpiTableHeader));
|
|
||||||
|
|
||||||
build_dbg_aml(dsdt);
|
build_dbg_aml(dsdt);
|
||||||
if (misc->is_piix4) {
|
if (misc->is_piix4) {
|
||||||
sb_scope = aml_scope("_SB");
|
sb_scope = aml_scope("_SB");
|
||||||
|
@ -1867,9 +1867,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
|
||||||
|
|
||||||
/* copy AML table into ACPI tables blob and patch header there */
|
/* copy AML table into ACPI tables blob and patch header there */
|
||||||
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
|
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
|
||||||
build_header(linker, table_data,
|
acpi_table_end(linker, &table);
|
||||||
(void *)(table_data->data + table_data->len - dsdt->buf->len),
|
|
||||||
"DSDT", dsdt->buf->len, 1, x86ms->oem_id, x86ms->oem_table_id);
|
|
||||||
free_aml_allocator();
|
free_aml_allocator();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue