[Qemu-devel] [PATCH 10/13] i386: acpi: add DSDT table using AML API

[Igor Mammedov]

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

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index bac0156..c8e38ff 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1206,18 +1206,16 @@ build_dmar_q35(GArray *table_data, GArray *linker)
 }
 
 static void
-build_dsdt(GArray *table_data, GArray *linker, AcpiMiscInfo *misc)
+build_dsdt(AcpiAml *table_data, AcpiMiscInfo *misc)
 {
-    AcpiTableHeader *dsdt;
+    AcpiAml *dsdt =
+        acpi_def_block("DSDT", 1, ACPI_BUILD_APPNAME6, ACPI_BUILD_APPNAME4, 1);
 
     assert(misc->dsdt_code && misc->dsdt_size);
+    aml_append(dsdt, aml_blob(misc->dsdt_code + sizeof(AcpiTableHeader),
+                              misc->dsdt_size - sizeof(AcpiTableHeader)));
 
-    dsdt = acpi_data_push(table_data, misc->dsdt_size);
-    memcpy(dsdt, misc->dsdt_code, misc->dsdt_size);
-
-    memset(dsdt, 0, sizeof *dsdt);
-    build_header(linker, table_data, dsdt, "DSDT",
-                 misc->dsdt_size, 1);
+    aml_append(table_data, dsdt);
 }
 
 /* Build final rsdt table */
@@ -1375,7 +1373,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables 
*tables)
 
     /* DSDT is pointed to by FADT */
     dsdt = tables->table_data->buf->len;
-    build_dsdt(tables->table_data->buf, tables->linker, &misc);
+    build_dsdt(tables->table_data, &misc);
 
     /* Count the size of the DSDT and SSDT, we will need it for legacy
      * sizing of ACPI tables.
-- 
1.8.3.1