# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302603558 -3600
# Node ID 63da98f210b0f708a6bd2f85bc03de8826655784
# Parent 31e9da762b1ebd22b5ed68d3a15ea56f4a41d63c
tools: hvmloader: Refactor ACPI table setup into struct bios_config
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 31e9da762b1e -r 63da98f210b0 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Tue Apr 12 11:05:11 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Tue Apr 12 11:19:18 2011 +0100
@@ -34,6 +34,8 @@ struct bios_config {
void (*vm86_setup)(void);
void (*e820_setup)(void);
+
+ void (*acpi_build_tables)(unsigned int physical);
};
extern struct bios_config rombios_config;
diff -r 31e9da762b1e -r 63da98f210b0 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c Tue Apr 12 11:05:11 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c Tue Apr 12 11:19:18 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 @@ int main(void)
.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 31e9da762b1e -r 63da98f210b0 tools/firmware/hvmloader/rombios.c
--- a/tools/firmware/hvmloader/rombios.c Tue Apr 12 11:05:11 2011 +0100
+++ b/tools/firmware/hvmloader/rombios.c Tue Apr 12 11:19:18 2011 +0100
@@ -330,6 +330,8 @@ struct bios_config rombios_config = {
.vm86_setup = rombios_init_vm86_tss,
.e820_setup = rombios_setup_e820,
+
+ .acpi_build_tables = acpi_build_tables,
};
/*
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home