Hi Igor,
On 7/8/21 5:45 PM, Igor Mammedov wrote:
> 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 <imamm...@redhat.com>
> Tested-by: Stefan Berger <stef...@linux.ibm.com>
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Eric
> ---
> CC: stef...@linux.vnet.ibm.com
> ---
> hw/acpi/aml-build.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 176d086b25..057c64fb48 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -2103,13 +2103,14 @@ void build_tpm2(GArray *table_data, BIOSLinker
> *linker, GArray *tcpalog,
> const char *oem_id, const char *oem_table_id)
> {
> uint8_t start_method_params[12] = {};
> - unsigned log_addr_offset, tpm2_start;
> + unsigned log_addr_offset;
> uint64_t control_area_start_address;
> TPMIf *tpmif = tpm_find();
> uint32_t start_method;
> + AcpiTable table = { .sig = "TPM2", .rev = 4,
> + .oem_id = oem_id, .oem_table_id = oem_table_id };
>
> - tpm2_start = table_data->len;
> - acpi_data_push(table_data, sizeof(AcpiTableHeader));
> + acpi_init_table(&table, table_data);
>
> /* Platform Class */
> build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);
> @@ -2147,9 +2148,7 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker,
> GArray *tcpalog,
> bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,
> log_addr_offset, 8,
> ACPI_BUILD_TPMLOG_FILE, 0);
> - build_header(linker, table_data,
> - (void *)(table_data->data + tpm2_start),
> - "TPM2", table_data->len - tpm2_start, 4, oem_id,
> oem_table_id);
> + acpi_table_composed(linker, &table);
> }
> #endif
>
>
