ia64/xen-unstable

changeset 6611:ed474440decd

Various minor vmxassist cleanups.

Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Sep 02 17:53:52 2005 +0000 (2005-09-02)
parents 7557c46a9edf
children 20140d3fbf83
files tools/firmware/vmxassist/Makefile tools/firmware/vmxassist/setup.c tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vmxloader.c
line diff
     1.1 --- a/tools/firmware/vmxassist/Makefile	Fri Sep 02 17:53:34 2005 +0000
     1.2 +++ b/tools/firmware/vmxassist/Makefile	Fri Sep 02 17:53:52 2005 +0000
     1.3 @@ -24,7 +24,7 @@ include $(XEN_ROOT)/tools/Rules.mk
     1.4  # The emulator code lives in ROM space
     1.5  TEXTADDR=0x000D0000
     1.6  
     1.7 -DEFINES=-DDEBUG -DENABLE_VME -DTEXTADDR=${TEXTADDR}
     1.8 +DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR}
     1.9  XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
    1.10  #DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
    1.11  #XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
     2.1 --- a/tools/firmware/vmxassist/TODO	Fri Sep 02 17:53:34 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,8 +0,0 @@
     2.4 -
     2.5 -- Use the VME extensions (interrupt handling)
     2.6 -
     2.7 -- Use E820 map in vmxassist instead of cmos hack
     2.8 -
     2.9 -- Add ACPI support (Nitin's patch)
    2.10 -
    2.11 -
     3.1 --- a/tools/firmware/vmxassist/setup.c	Fri Sep 02 17:53:34 2005 +0000
     3.2 +++ b/tools/firmware/vmxassist/setup.c	Fri Sep 02 17:53:52 2005 +0000
     3.3 @@ -353,7 +353,7 @@ main()
     3.4  #endif
     3.5  	setup_gdt();
     3.6  	setup_idt();
     3.7 -#ifdef	ENABLE_VME
     3.8 +#ifndef	TEST
     3.9  	set_cr4(get_cr4() | CR4_VME); 
    3.10  #endif
    3.11  	setup_ctx();
     4.1 --- a/tools/firmware/vmxassist/vm86.c	Fri Sep 02 17:53:34 2005 +0000
     4.2 +++ b/tools/firmware/vmxassist/vm86.c	Fri Sep 02 17:53:52 2005 +0000
     4.3 @@ -465,8 +465,7 @@ movcr(struct regs *regs, unsigned prefix
     4.4   * Emulate a segment load in protected mode
     4.5   */
     4.6  int
     4.7 -load_seg(unsigned long sel, unsigned long *base, unsigned long *limit,
     4.8 -						union vmcs_arbytes *arbytes)
     4.9 +load_seg(unsigned long sel, u32 *base, u32 *limit, union vmcs_arbytes *arbytes)
    4.10  {
    4.11  	unsigned long long entry;
    4.12  
     5.1 --- a/tools/firmware/vmxassist/vmxloader.c	Fri Sep 02 17:53:34 2005 +0000
     5.2 +++ b/tools/firmware/vmxassist/vmxloader.c	Fri Sep 02 17:53:52 2005 +0000
     5.3 @@ -110,8 +110,8 @@ main()
     5.4  	}
     5.5  #ifdef _ACPI_
     5.6  	puts("Loading ACPI ...\n");
     5.7 -    if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){
     5.8 -        /* make sure acpi table does not overlap rombios
     5.9 +	if (ACPI_PHYSICAL_ADDRESS+sizeof(acpi) <= 0xF0000 ){
    5.10 +		/* make sure acpi table does not overlap rombios
    5.11   		 * currently acpi less than 8K will be OK.
    5.12  		 */
    5.13  		 memcpy((void *)ACPI_PHYSICAL_ADDRESS, acpi, sizeof(acpi));
    5.14 @@ -122,5 +122,6 @@ main()
    5.15  	memcpy((void *)TEXTADDR, vmxassist, sizeof(vmxassist));
    5.16  	puts("Go ...\n");
    5.17  	((void (*)())TEXTADDR)();
    5.18 +	return 0;
    5.19  }
    5.20