On 9/7/21 4:47 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>
> ---
> v3:
> * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
>
> CC: marcel.apfelbaum@gmail.com
> ---
> hw/i386/acpi-build.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 45724469b0..9f888d5a2c 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2319,12 +2319,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> const char *oem_table_id)
> {
> int ivhd_table_len = 24;
> - int iommu_start = table_data->len;
> AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default());
> GArray *ivhd_blob = g_array_new(false, true, 1);
> + AcpiTable table = { .sig = "IVRS", .rev = 1, .oem_id = oem_id,
> + .oem_table_id = oem_table_id };
>
> - /* IVRS header */
> - acpi_data_push(table_data, sizeof(AcpiTableHeader));
> + acpi_table_begin(&table, table_data);
> /* IVinfo - IO virtualization information common to all
> * IOMMU units in a system
> */
> @@ -2409,10 +2409,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> 0x48, /* special device */
> 8);
> }
> -
> - build_header(linker, table_data, (void *)(table_data->data + iommu_start),
> - "IVRS", table_data->len - iommu_start, 1, oem_id,
> - oem_table_id);
> + acpi_table_end(linker, &table);
> }
>
> typedef
>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric