|
@@ -2341,12 +2341,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
|
const char *oem_table_id)
|
|
const char *oem_table_id)
|
|
{
|
|
{
|
|
int ivhd_table_len = 24;
|
|
int ivhd_table_len = 24;
|
|
- int iommu_start = table_data->len;
|
|
|
|
AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default());
|
|
AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default());
|
|
GArray *ivhd_blob = g_array_new(false, true, 1);
|
|
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
|
|
/* IVinfo - IO virtualization information common to all
|
|
* IOMMU units in a system
|
|
* IOMMU units in a system
|
|
*/
|
|
*/
|
|
@@ -2431,10 +2431,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
|
0x48, /* special device */
|
|
0x48, /* special device */
|
|
8);
|
|
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
|
|
typedef
|