commit a76d6dbad28f0afee4f95eef0a60b74cc08f0c98
author Michael S. Tsirkin <mst@redhat.com> Mon Oct 07 14:49:11 2013 +0300
committer Michael S. Tsirkin <mst@redhat.com> Thu Oct 10 10:59:22 2013 +0300
tree 6b92b7e09701e79d3761850bbd72ce7af4a45d8d
parent 97ff79344a3cc6b6dc79bda7aa7392c90d0ba9f8

acpi-build: load tables supplied by user

If user supplies any SSDTs using -acpi,
install them in addition to the built-in ones.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

hw/i386/acpi-build.c

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 262d1d6..6cfa044 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1041,6 +1041,7 @@
     AcpiMiscInfo misc;
     AcpiMcfgInfo mcfg;
     PcPciInfo pci;
+    uint8_t *u;
 
     acpi_get_cpu_info(&cpu);
     acpi_get_pm_info(&pm);
@@ -1092,6 +1093,14 @@
         build_mcfg_q35(tables->table_data, tables->linker, &mcfg);
     }
 
+    /* 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);
+        g_array_append_vals(tables->table_data, u, len);
+    }
+
     /* RSDT is pointed to by RSDP */
     rsdt = tables->table_data->len;
     build_rsdt(tables->table_data, tables->linker, table_offsets);