OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

acpi: build_fadt: use acpi_table_begin()/acpi_table_end() instead of build_header()

Browse Source 
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-6-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:32 -04:00 committed by Michael S. Tsirkin
parent 7469f1991d
commit 4b56e1e4eb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/acpi/aml-build.c
View File

@ -1982,9 +1982,10 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
const char *oem_id, const char *oem_table_id) const char *oem_id, const char *oem_table_id)
{ {
int off; int off;
int fadt_start = tbl->len; AcpiTable table = { .sig = "FACP", .rev = f->rev,
.oem_id = oem_id, .oem_table_id = oem_table_id };
acpi_data_push(tbl, sizeof(AcpiTableHeader)); acpi_table_begin(&table, tbl);
/* FACS address to be filled by Guest linker at runtime */ /* FACS address to be filled by Guest linker at runtime */
off = tbl->len; off = tbl->len;
@ -2048,7 +2049,7 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
build_append_int_noprefix(tbl, f->flags, 4); /* Flags */ build_append_int_noprefix(tbl, f->flags, 4); /* Flags */
if (f->rev == 1) { if (f->rev == 1) {
goto build_hdr; goto done;
} }
build_append_gas_from_struct(tbl, &f->reset_reg); /* RESET_REG */ build_append_gas_from_struct(tbl, &f->reset_reg); /* RESET_REG */
@ -2085,7 +2086,7 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0); /* X_GPE1_BLK */ build_append_gas(tbl, AML_AS_SYSTEM_MEMORY, 0 , 0, 0, 0); /* X_GPE1_BLK */
if (f->rev <= 4) { if (f->rev <= 4) {
goto build_hdr; goto done;
} }
/* SLEEP_CONTROL_REG */ /* SLEEP_CONTROL_REG */
@ -2096,9 +2097,8 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,
/* TODO: extra fields need to be added to support revisions above rev5 */ /* TODO: extra fields need to be added to support revisions above rev5 */
assert(f->rev == 5); assert(f->rev == 5);
build_hdr: done:
build_header(linker, tbl, (void *)(tbl->data + fadt_start), acpi_table_end(linker, &table);
"FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);
} }
#ifdef CONFIG_TPM #ifdef CONFIG_TPM