[Qemu-devel] [PATCH 08/13] i386: acpi: hack not yet converted tables calls to deal with table_data being a pointer

[Igor Mammedov]

Signed-off-by: Igor Mammedov <address@hidden>
---
 hw/i386/acpi-build.c | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 624c903..bac0156 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1370,66 +1370,66 @@ void acpi_build(PcGuestInfo *guest_info, 
AcpiBuildTables *tables)
      * We place it first since it's the only table that has alignment
      * requirements.
      */
-    facs = tables->table_data.buf->len;
-    build_facs(tables->table_data.buf, tables->linker, guest_info);
+    facs = tables->table_data->buf->len;
+    build_facs(tables->table_data->buf, tables->linker, guest_info);
 
     /* DSDT is pointed to by FADT */
-    dsdt = tables->table_data.buf->len;
-    build_dsdt(tables->table_data.buf, tables->linker, &misc);
+    dsdt = tables->table_data->buf->len;
+    build_dsdt(tables->table_data->buf, tables->linker, &misc);
 
     /* Count the size of the DSDT and SSDT, we will need it for legacy
      * sizing of ACPI tables.
      */
-    aml_len += tables->table_data.buf->len - dsdt;
+    aml_len += tables->table_data->buf->len - dsdt;
 
     /* ACPI tables pointed to by RSDT */
-    acpi_add_table(table_offsets, tables->table_data.buf);
-    build_fadt(tables->table_data.buf, tables->linker, &pm, facs, dsdt);
+    acpi_add_table(table_offsets, tables->table_data->buf);
+    build_fadt(tables->table_data->buf, tables->linker, &pm, facs, dsdt);
 
-    ssdt = tables->table_data.buf->len;
-    acpi_add_table(table_offsets, tables->table_data.buf);
-    build_ssdt(&tables->table_data, tables->linker, &cpu, &pm, &misc, &pci,
+    ssdt = tables->table_data->buf->len;
+    acpi_add_table(table_offsets, tables->table_data->buf);
+    build_ssdt(tables->table_data, tables->linker, &cpu, &pm, &misc, &pci,
                guest_info);
-    aml_len += tables->table_data.buf->len - ssdt;
+    aml_len += tables->table_data->buf->len - ssdt;
 
-    acpi_add_table(table_offsets, tables->table_data.buf);
-    build_madt(tables->table_data.buf, tables->linker, &cpu, guest_info);
+    acpi_add_table(table_offsets, tables->table_data->buf);
+    build_madt(tables->table_data->buf, tables->linker, &cpu, guest_info);
 
     if (misc.has_hpet) {
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_hpet(tables->table_data.buf, tables->linker);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_hpet(tables->table_data->buf, tables->linker);
     }
     if (misc.has_tpm) {
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_tpm_tcpa(tables->table_data.buf, tables->linker, 
tables->tcpalog);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_tpm_tcpa(tables->table_data->buf, tables->linker, 
tables->tcpalog);
 
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_tpm_ssdt(tables->table_data.buf, tables->linker);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_tpm_ssdt(tables->table_data->buf, tables->linker);
     }
     if (guest_info->numa_nodes) {
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_srat(tables->table_data.buf, tables->linker, guest_info);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_srat(tables->table_data->buf, tables->linker, guest_info);
     }
     if (acpi_get_mcfg(&mcfg)) {
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_mcfg_q35(tables->table_data.buf, tables->linker, &mcfg);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_mcfg_q35(tables->table_data->buf, tables->linker, &mcfg);
     }
     if (acpi_has_iommu()) {
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        build_dmar_q35(tables->table_data.buf, tables->linker);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        build_dmar_q35(tables->table_data->buf, tables->linker);
     }
 
     /* Add tables supplied by user (if any) */
     for (u = acpi_table_first(); u; u = acpi_table_next(u)) {
         unsigned len = acpi_table_len(u);
 
-        acpi_add_table(table_offsets, tables->table_data.buf);
-        g_array_append_vals(tables->table_data.buf, u, len);
+        acpi_add_table(table_offsets, tables->table_data->buf);
+        g_array_append_vals(tables->table_data->buf, u, len);
     }
 
     /* RSDT is pointed to by RSDP */
-    rsdt = tables->table_data.buf->len;
-    build_rsdt(tables->table_data.buf, tables->linker, table_offsets);
+    rsdt = tables->table_data->buf->len;
+    build_rsdt(tables->table_data->buf, tables->linker, table_offsets);
 
     /* RSDP is in FSEG memory, so allocate it separately */
     build_rsdp(tables->rsdp, tables->linker, rsdt);
-- 
1.8.3.1