Various minor vmxassist cleanups.
(patches are against current xen-vt-testing tree)
Signed-Off-By: Leendert van Doorn <leendert@xxxxxxxxxxxxxx>
diff -r dfaf788ab18c tools/firmware/vmxassist/Makefile
--- a/tools/firmware/vmxassist/Makefile Fri Aug 26 20:47:16 2005
+++ b/tools/firmware/vmxassist/Makefile Fri Sep 2 08:22:26 2005
@@ -24,7 +24,7 @@
# The emulator code lives in ROM space
TEXTADDR=0x000D0000
-DEFINES=-DDEBUG -DENABLE_VME -DTEXTADDR=${TEXTADDR}
+DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR}
XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
#DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
#XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
diff -r dfaf788ab18c tools/firmware/vmxassist/setup.c
--- a/tools/firmware/vmxassist/setup.c Fri Aug 26 20:47:16 2005
+++ b/tools/firmware/vmxassist/setup.c Fri Sep 2 08:22:26 2005
@@ -353,7 +353,7 @@
#endif
setup_gdt();
setup_idt();
-#ifdef ENABLE_VME
+#ifndef TEST
set_cr4(get_cr4() | CR4_VME);
#endif
setup_ctx();
diff -r dfaf788ab18c tools/firmware/vmxassist/vm86.c
--- a/tools/firmware/vmxassist/vm86.c Fri Aug 26 20:47:16 2005
+++ b/tools/firmware/vmxassist/vm86.c Fri Sep 2 08:22:26 2005
@@ -465,8 +465,7 @@
* Emulate a segment load in protected mode
*/
int
-load_seg(unsigned long sel, unsigned long *base, unsigned long *limit,
- union vmcs_arbytes *arbytes)
+load_seg(unsigned long sel, u32 *base, u32 *limit, union vmcs_arbytes *arbytes)
{
unsigned long long entry;
diff -r dfaf788ab18c tools/firmware/vmxassist/vmxloader.c
--- a/tools/firmware/vmxassist/vmxloader.c Fri Aug 26 20:47:16 2005
+++ b/tools/firmware/vmxassist/vmxloader.c Fri Sep 2 08:22:26 2005
@@ -110,8 +110,8 @@
}
#ifdef _ACPI_
puts("Loading ACPI ...\n");
- if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){
- /* make sure acpi table does not overlap rombios
+ if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){
+ /* make sure acpi table does not overlap rombios
* currently acpi less than 8K will be OK.
*/
memcpy((void *)ACPI_PHYSICAL_ADDRESS, acpi, sizeof(acpi));
@@ -122,5 +122,6 @@
memcpy((void *)TEXTADDR, vmxassist, sizeof(vmxassist));
puts("Go ...\n");
((void (*)())TEXTADDR)();
+ return 0;
}
diff -r dfaf788ab18c tools/firmware/vmxassist/TODO
--- a/tools/firmware/vmxassist/TODO Fri Aug 26 20:47:16 2005
+++ /dev/null Fri Sep 2 08:22:26 2005
@@ -1,8 +0,0 @@
-
-- Use the VME extensions (interrupt handling)
-
-- Use E820 map in vmxassist instead of cmos hack
-
-- Add ACPI support (Nitin's patch)
-
-
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home