ia64/xen-unstable

changeset 3796:50e6fb796ba1

bitkeeper revision 1.1184 (420ce06eLX3IXXYgfWOdCOQZS6HoDg)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen-unstable.bk
author cl349@arcadians.cl.cam.ac.uk
date Fri Feb 11 16:42:22 2005 +0000 (2005-02-11)
parents 2d4c4c4574f2 ce2496aed8c9
children 7561a06348cf 5ae8472841a3
files .rootkeys tools/vnet/00INSTALL tools/vnet/Makefile tools/vnet/vnet-module/if_varp.h tools/vnet/vnet-module/varp.c xen/arch/x86/extable.c xen/arch/x86/x86_32/entry.S
line diff
     1.1 --- a/.rootkeys	Fri Feb 11 14:37:07 2005 +0000
     1.2 +++ b/.rootkeys	Fri Feb 11 16:42:22 2005 +0000
     1.3 @@ -770,6 +770,7 @@ 4104ffca-jPHLVOrW0n0VghEXXtKxg tools/sv/
     1.4  40fcefb3yMSrZvApO9ToIi-iQwnchA tools/sv/images/xen.png
     1.5  41013a83z27rKvWIxAfUBMVZ1eDCDg tools/sv/inc/script.js
     1.6  40fcefb3zGC9XNBkSwTEobCoq8YClA tools/sv/inc/style.css
     1.7 +420b963dK3yGNtqxRM8npGZtrCQd1g tools/vnet/00INSTALL
     1.8  41a21888_WlknVWjSxb32Fo13_ujsw tools/vnet/00README
     1.9  420a9b706I-bN_uPdiy0m3rmDifNNg tools/vnet/INSTALL
    1.10  41a21888bOiOJc7blzRbe4MNJoaYTw tools/vnet/Makefile
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/tools/vnet/00INSTALL	Fri Feb 11 16:42:22 2005 +0000
     2.3 @@ -0,0 +1,31 @@
     2.4 +
     2.5 +To compile and install run "make install"; if it fails or you need to reinstall 
     2.6 +run "make clean" first or the build will fail, at least that is what I have 
     2.7 +found under 2.6.10.
     2.8 +
     2.9 +Other important items:
    2.10 +1)	You will need to have your xen0 kernel compiled with HMAC_SUPPORT 
    2.11 +	2.6.x = (MAIN MENU: Cryptographic Options -> HMAC Support)
    2.12 +	BEFORE running "make install".
    2.13 +
    2.14 +2)	You will want at least some of the other alogorithms listed under
    2.15 +	"Cryptographic Options" for the kernel compiled as modules.
    2.16 +
    2.17 +3)	You will want the networking IPsec/VLAN options compiled in as modules
    2.18 +	2.6.x = (MAIN MENU: Device Drivers -> Networking Support -> 
    2.19 +				Networking Options ->
    2.20 +					IP: AH transformation
    2.21 +					IP: ESP transformation
    2.22 +					IP: IPComp transformation 
    2.23 +					IP: tunnel transformation
    2.24 +
    2.25 +					IPsec user configuration interface
    2.26 +	
    2.27 +					802.1Q VLAN Support
    2.28 +
    2.29 +4)	The module (vnet_module) will not properly load from the command line
    2.30 +	with a "modprobe vnet_module".  Use network-vnet to properly configure
    2.31 +	your system and load the module for you.
    2.32 +
    2.33 +Please refer to the additional documentation found in tools/vnet/doc for
    2.34 +proper syntax and config file parameters.
     6.1 --- a/xen/arch/x86/extable.c	Fri Feb 11 14:37:07 2005 +0000
     6.2 +++ b/xen/arch/x86/extable.c	Fri Feb 11 16:42:22 2005 +0000
     6.3 @@ -63,8 +63,9 @@ search_exception_table(unsigned long add
     6.4  }
     6.5  
     6.6  unsigned long
     6.7 -search_pre_exception_table(unsigned long addr)
     6.8 +search_pre_exception_table(struct xen_regs *regs)
     6.9  {
    6.10 +    unsigned long addr = (unsigned long)regs->eip;
    6.11      unsigned long fixup = search_one_table(
    6.12          __start___pre_ex_table, __stop___pre_ex_table-1, addr);
    6.13      DPRINTK("Pre-exception: %p -> %p\n", addr, fixup);
     7.1 --- a/xen/arch/x86/x86_32/entry.S	Fri Feb 11 14:37:07 2005 +0000
     7.2 +++ b/xen/arch/x86/x86_32/entry.S	Fri Feb 11 16:42:22 2005 +0000
     7.3 @@ -481,7 +481,7 @@ exception_with_ints_disabled:
     7.4          testl $(3|X86_EFLAGS_VM),%eax   # interrupts disabled outside Xen?
     7.5          jnz   1b                        # it really does happen!
     7.6                                          #  (e.g., DOM0 X server)
     7.7 -        pushl XREGS_eip(%esp)
     7.8 +        pushl %esp
     7.9          call  search_pre_exception_table
    7.10          addl  $4,%esp
    7.11          testl %eax,%eax                 # no fixup code for faulting EIP?