diff options
| -rw-r--r-- | buildconfigs/Rules.mk | 2 | ||||
| -rw-r--r-- | buildconfigs/mk.netbsd-2.0-xenU | 2 | ||||
| -rwxr-xr-x | netbsd-2.0-xen-sparse/mkbuildtree | 2 | ||||
| -rw-r--r-- | netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S | 2 | ||||
| -rw-r--r-- | netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c | 4 |
5 files changed, 9 insertions, 3 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index 56e7848048..cf71d07595 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -27,7 +27,7 @@ linux-%.tar.bz2: # Expand NetBSD release to NetBSD version NETBSD_RELEASE ?= 2.0 NETBSD_VER ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse)) -NETBSD_CVSSNAP ?= 20041103 +NETBSD_CVSSNAP ?= 20050309 # Setup NetBSD search path NETBSD_SRC_PATH ?= .:.. diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU index acd7e5801a..2e272aa6b3 100644 --- a/buildconfigs/mk.netbsd-2.0-xenU +++ b/buildconfigs/mk.netbsd-2.0-xenU @@ -1,6 +1,6 @@ NETBSD_RELEASE ?= 2.0 -NETBSD_CVSSNAP ?= 20041103 +NETBSD_CVSSNAP ?= 20050309 EXTRAVERSION = xenU diff --git a/netbsd-2.0-xen-sparse/mkbuildtree b/netbsd-2.0-xen-sparse/mkbuildtree index ef85a8922a..bd99cbda9a 100755 --- a/netbsd-2.0-xen-sparse/mkbuildtree +++ b/netbsd-2.0-xen-sparse/mkbuildtree @@ -93,7 +93,7 @@ abs_to_rel ${AD} ${AS} RS=$DESTPATH # Remove old copies of files and directories at the destination -for i in `find . -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done +for i in `find sys -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done # We now work from the destination directory cd ${AD} diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S index a8967d75cb..d018b06a64 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S @@ -249,6 +249,7 @@ _C_LABEL(biosextmem): .long REALEXTMEM #include <machine/xen.h> #define __HYPERVISOR_yield 8 +#define __SCHEDOP_yield 0 .space 512 tmpstk: @@ -1592,6 +1593,7 @@ idle_loop: jmp idle_start 4: movl $__HYPERVISOR_yield,%eax + movl $__SCHEDOP_yield,%ebx TRAP_INSTR NENTRY(mpidle) idle_start: diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c index ded4538782..54752025b6 100644 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c @@ -854,6 +854,10 @@ haltsys: if (howto & RB_HALT) { printf("\n"); printf("The operating system has halted.\n"); + + /* XXX cngetc() below doesn't work, shutdown machine for now */ + HYPERVISOR_shutdown(); + printf("Please press any key to reboot.\n\n"); #ifdef BEEP_ONHALT |