[Xen-changelog] [xen-unstable] hvmloader: make ACPI initialisation hook more general.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1306943071 -3600
# Node ID b4bb41dd122ef86147cc14421957f016066e7f46
# Parent  a5531244a818c36199f195434baf3d743ef682dd
hvmloader: make ACPI initialisation hook more general.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r a5531244a818 -r b4bb41dd122e tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Wed Jun 01 16:43:52 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Wed Jun 01 16:44:31 2011 +0100
@@ -23,16 +23,13 @@
     int load_roms;
     unsigned int optionrom_start, optionrom_end;
 
-    /* ACPI tables */
-    unsigned int acpi_start;
-
     uint32_t (*bios_high_setup)(void);
     void (*bios_info_setup)(uint32_t);
 
     void (*vm86_setup)(void);
     void (*e820_setup)(void);
 
-    void (*acpi_build_tables)(unsigned int physical);
+    void (*acpi_build_tables)(void);
     void (*create_mp_tables)(void);
 };
 
diff -r a5531244a818 -r b4bb41dd122e tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Wed Jun 01 16:43:52 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Wed Jun 01 16:44:31 2011 +0100
@@ -472,7 +472,7 @@
 
         if ( bios->acpi_build_tables ) {
             printf("Loading ACPI ...\n");
-            bios->acpi_build_tables(bios->acpi_start);
+            bios->acpi_build_tables();
         }
         hypercall_hvm_op(HVMOP_set_param, &p);
     }
diff -r a5531244a818 -r b4bb41dd122e tools/firmware/hvmloader/rombios.c
--- a/tools/firmware/hvmloader/rombios.c        Wed Jun 01 16:43:52 2011 +0100
+++ b/tools/firmware/hvmloader/rombios.c        Wed Jun 01 16:44:31 2011 +0100
@@ -115,6 +115,11 @@
     *((uint8_t *)(ROMBIOS_BEGIN + ROMBIOS_MAXOFFSET)) = -checksum;
 }
 
+static void rombios_acpi_build_tables(void)
+{
+    acpi_build_tables(ACPI_PHYSICAL_ADDRESS);
+}
+
 static void rombios_create_mp_tables(void)
 {
     /* Find the 'safe' place in ROMBIOS for the MP tables. */
@@ -149,15 +154,13 @@
     .optionrom_start = OPTIONROM_PHYSICAL_ADDRESS,
     .optionrom_end = OPTIONROM_PHYSICAL_END,
 
-    .acpi_start = ACPI_PHYSICAL_ADDRESS,
-
     .bios_high_setup = rombios_highbios_setup,
     .bios_info_setup = rombios_setup_bios_info,
 
     .vm86_setup = rombios_init_vm86_tss,
     .e820_setup = rombios_setup_e820,
 
-    .acpi_build_tables = acpi_build_tables,
+    .acpi_build_tables = rombios_acpi_build_tables,
     .create_mp_tables = rombios_create_mp_tables,
 };
 
diff -r a5531244a818 -r b4bb41dd122e tools/firmware/hvmloader/seabios.c
--- a/tools/firmware/hvmloader/seabios.c        Wed Jun 01 16:43:52 2011 +0100
+++ b/tools/firmware/hvmloader/seabios.c        Wed Jun 01 16:44:31 2011 +0100
@@ -46,8 +46,6 @@
     .optionrom_start = 0,
     .optionrom_end = 0,
 
-    .acpi_start = 0,
-
     .bios_info_setup = NULL,
 
     .vm86_setup = NULL,

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