mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Various minor vmxassist cleanups.
Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
68e994a7ed
commit
bfbc365faa
5 files changed
+6
-14
No files matched your search
@@ -24,7 +24,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
# 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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -353,7 +353,7 @@ main()
|
||||
#endif
|
||||
setup_gdt();
|
||||
setup_idt();
|
||||
#ifdef ENABLE_VME
|
||||
#ifndef TEST
|
||||
set_cr4(get_cr4() | CR4_VME);
|
||||
#endif
|
||||
setup_ctx();
|
||||
|
||||
@@ -465,8 +465,7 @@ movcr(struct regs *regs, unsigned prefix, unsigned opc)
|
||||
* 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;
|
||||
|
||||
|
||||
@@ -110,8 +110,8 @@ main()
|
||||
}
|
||||
#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 @@ main()
|
||||
memcpy((void *)TEXTADDR, vmxassist, sizeof(vmxassist));
|
||||
puts("Go ...\n");
|
||||
((void (*)())TEXTADDR)();
|
||||
return 0;
|
||||
}
|
||||
|
||||