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>
---
CC: marcel.apfelb...@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 739f555310..ea6bfff5b7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2219,12 +2219,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_init_table(&table, table_data);
/* IVinfo - IO virtualization information common to all
* IOMMU units in a system
*/
@@ -2309,10 +2309,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_composed(linker, &table);
}
typedef
--
2.27.0
