ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acpi: build_dsdt_microvm: 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-27-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:
Igor Mammedov 2021-09-24 08:27:53 -04:00 committed by Michael S. Tsirkin
parent 37f33084ed
commit 8f20f9a736
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/i386/acpi-microvm.c
View File

@ -113,16 +113,16 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
Aml *dsdt, *sb_scope, *scope, *pkg; Aml *dsdt, *sb_scope, *scope, *pkg;
bool ambiguous; bool ambiguous;
Object *isabus; Object *isabus;
AcpiTable table = { .sig = "DSDT", .rev = 2, .oem_id = x86ms->oem_id,
.oem_table_id = x86ms->oem_table_id };
isabus = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); isabus = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous);
assert(isabus); assert(isabus);
assert(!ambiguous); assert(!ambiguous);
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));
sb_scope = aml_scope("_SB"); sb_scope = aml_scope("_SB");
fw_cfg_add_acpi_dsdt(sb_scope, x86ms->fw_cfg); fw_cfg_add_acpi_dsdt(sb_scope, x86ms->fw_cfg);
isa_build_aml(ISA_BUS(isabus), sb_scope); isa_build_aml(ISA_BUS(isabus), sb_scope);
@ -144,11 +144,10 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker,
aml_append(scope, aml_name_decl("_S5", pkg)); aml_append(scope, aml_name_decl("_S5", pkg));
aml_append(dsdt, scope); aml_append(dsdt, scope);
/* copy AML table into ACPI tables blob and patch header there */ /* copy AML bytecode into ACPI tables blob */
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,
(void *)(table_data->data + table_data->len - dsdt->buf->len), acpi_table_end(linker, &table);
"DSDT", dsdt->buf->len, 2, x86ms->oem_id, x86ms->oem_table_id);
free_aml_allocator(); free_aml_allocator();
} }