ia64/xen-unstable

changeset 4033:77fbd1da5611

bitkeeper revision 1.1236.12.15 (422e5a69zhiLV3Xbq3D-aL20QlyddA)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/netbsd/xen-unstable.bk
author cl349@firebug.cl.cam.ac.uk
date Wed Mar 09 02:07:37 2005 +0000 (2005-03-09)
parents 2a8ffe96dc3d 7a898f4725b2
children b27fb6c2ea52 8c6d9b578870
files buildconfigs/Rules.mk buildconfigs/mk.netbsd-2.0-xenU netbsd-2.0-xen-sparse/mkbuildtree netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c
line diff
     1.1 --- a/buildconfigs/Rules.mk	Wed Mar 09 00:48:41 2005 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Wed Mar 09 02:07:37 2005 +0000
     1.3 @@ -27,7 +27,7 @@ linux-%.tar.bz2:
     1.4  # Expand NetBSD release to NetBSD version
     1.5  NETBSD_RELEASE  ?= 2.0
     1.6  NETBSD_VER      ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse))
     1.7 -NETBSD_CVSSNAP  ?= 20041103
     1.8 +NETBSD_CVSSNAP  ?= 20050309
     1.9  
    1.10  # Setup NetBSD search path
    1.11  NETBSD_SRC_PATH	?= .:..
     2.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Wed Mar 09 00:48:41 2005 +0000
     2.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Wed Mar 09 02:07:37 2005 +0000
     2.3 @@ -1,6 +1,6 @@
     2.4  
     2.5  NETBSD_RELEASE   ?= 2.0
     2.6 -NETBSD_CVSSNAP   ?= 20041103
     2.7 +NETBSD_CVSSNAP   ?= 20050309
     2.8  
     2.9  EXTRAVERSION = xenU
    2.10  
     3.1 --- a/netbsd-2.0-xen-sparse/mkbuildtree	Wed Mar 09 00:48:41 2005 +0000
     3.2 +++ b/netbsd-2.0-xen-sparse/mkbuildtree	Wed Mar 09 02:07:37 2005 +0000
     3.3 @@ -93,7 +93,7 @@ abs_to_rel ${AD} ${AS}
     3.4  RS=$DESTPATH
     3.5  
     3.6  # Remove old copies of files and directories at the destination
     3.7 -for i in `find . -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done
     3.8 +for i in `find sys -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done
     3.9  
    3.10  # We now work from the destination directory
    3.11  cd ${AD}
     4.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Wed Mar 09 00:48:41 2005 +0000
     4.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Wed Mar 09 02:07:37 2005 +0000
     4.3 @@ -249,6 +249,7 @@
     4.4  
     4.5  #include <machine/xen.h>
     4.6  #define __HYPERVISOR_yield		   8
     4.7 +#define __SCHEDOP_yield			   0
     4.8  
     4.9  	.space 512
    4.10  tmpstk:
    4.11 @@ -1592,6 +1593,7 @@ idle_loop:
    4.12  	jmp	idle_start
    4.13  4:
    4.14  	movl	$__HYPERVISOR_yield,%eax
    4.15 +	movl	$__SCHEDOP_yield,%ebx
    4.16  	TRAP_INSTR
    4.17  NENTRY(mpidle)
    4.18  idle_start:	
     5.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c	Wed Mar 09 00:48:41 2005 +0000
     5.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c	Wed Mar 09 02:07:37 2005 +0000
     5.3 @@ -854,6 +854,10 @@ haltsys:
     5.4  	if (howto & RB_HALT) {
     5.5  		printf("\n");
     5.6  		printf("The operating system has halted.\n");
     5.7 +
     5.8 +		/* XXX cngetc() below doesn't work, shutdown machine for now */
     5.9 +		HYPERVISOR_shutdown();
    5.10 +
    5.11  		printf("Please press any key to reboot.\n\n");
    5.12  
    5.13  #ifdef BEEP_ONHALT