Re: [PATCH v2 13/35] acpi: x86: build_dsdt: use acpi_init_table()/acpi_table_composed() instead of build_header()

[Eric Auger]

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 <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

Eric
> ---
> 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();
>  }
>  
>