[Xen-changelog] [xen-unstable] tools: hvmloader: Refactor ACPI table setup into struct bios_config

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302612409 -3600
# Node ID 36799b6d1db21a9c1dd248d385805ccdb338a812
# Parent  845d654b6117e23062b586f19ce7a1837c619184
tools: hvmloader: Refactor ACPI table setup into struct bios_config

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 845d654b6117 -r 36799b6d1db2 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Tue Apr 12 13:46:20 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Tue Apr 12 13:46:49 2011 +0100
@@ -34,6 +34,8 @@
 
     void (*vm86_setup)(void);
     void (*e820_setup)(void);
+
+    void (*acpi_build_tables)(unsigned int physical);
 };
 
 extern struct bios_config rombios_config;
diff -r 845d654b6117 -r 36799b6d1db2 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 13:46:20 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 13:46:49 2011 +0100
@@ -20,7 +20,6 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "acpi/acpi2_0.h"
 #include "util.h"
 #include "hypercall.h"
 #include "config.h"
@@ -431,8 +430,10 @@
             .value = 1,
         };
 
-        printf("Loading ACPI ...\n");
-        acpi_build_tables(bios->acpi_start);
+        if ( bios->acpi_build_tables ) {
+            printf("Loading ACPI ...\n");
+            bios->acpi_build_tables(bios->acpi_start);
+        }
         hypercall_hvm_op(HVMOP_set_param, &p);
     }
 
diff -r 845d654b6117 -r 36799b6d1db2 tools/firmware/hvmloader/rombios.c
--- a/tools/firmware/hvmloader/rombios.c        Tue Apr 12 13:46:20 2011 +0100
+++ b/tools/firmware/hvmloader/rombios.c        Tue Apr 12 13:46:49 2011 +0100
@@ -330,6 +330,8 @@
 
     .vm86_setup = rombios_init_vm86_tss,
     .e820_setup = rombios_setup_e820,
+
+    .acpi_build_tables = acpi_build_tables,
 };
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog