ia64/xen-unstable

changeset 5629:1bfa723fe264

Manual merge
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 01 12:45:24 2005 +0000 (2005-07-01)
parents 61df3453426c 15a2de6f1493
children 749dbd8ae9b0
files Makefile freebsd-5.3-xen-sparse/fbsdxensetup tools/examples/Makefile tools/examples/bochsrc tools/examples/xmexample.vmx tools/ioemu/target-i386-dm/Makefile tools/misc/xen-clone xen/Makefile xen/arch/x86/boot/mkelf32.c
line diff
     1.1 --- a/freebsd-5.3-xen-sparse/fbsdxensetup	Fri Jul 01 12:30:19 2005 +0000
     1.2 +++ b/freebsd-5.3-xen-sparse/fbsdxensetup	Fri Jul 01 12:45:24 2005 +0000
     1.3 @@ -1,6 +1,11 @@
     1.4  #!/bin/csh -f
     1.5  
     1.6 -setenv XENROOT `bk root`
     1.7 +setenv XENROOT `pwd`
     1.8 +cd $XENROOT
     1.9 +if ( ! -d freebsd-5.3-xen-sparse ) then
    1.10 +  echo "Please run this script from the root of the Xen source tree"
    1.11 +  exit 1
    1.12 +endif
    1.13  rm -rf $XENROOT/fbsdtmp $XENROOT/freebsd-5.3-xenU
    1.14  mkdir -p $XENROOT/fbsdtmp
    1.15  cd $XENROOT/fbsdtmp
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/tools/examples/bochsrc	Fri Jul 01 12:45:24 2005 +0000
     2.3 @@ -0,0 +1,20 @@
     2.4 +#megs: 32
     2.5 +#romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
     2.6 +#vgaromimage: $BXSHARE/VGABIOS-lgpl-latest
     2.7 +floppya: 1_44=a.img, status=inserted
     2.8 +floppyb: 1_44=b.img, status=inserted
     2.9 +# if you don't use absolute paths below, bochs looks under the cwd of xend, 
    2.10 +# which is usually "/"
    2.11 +#ata0-master: type=disk, path=/var/images/min-el3-i386.img, cylinders=800, heads=4, spt=32
    2.12 +i440fxsupport: enabled=1
    2.13 +ne2k: ioaddr=0x300, irq=9, mac=b0:c4:22:01:00:00, ethmod=linux, ethdev=eth0
    2.14 +ata0-master: type=disk, path=/var/images/1g-el3-i386.img, mode=flat, cylinders=2048, heads=16, spt=63
    2.15 +boot: c
    2.16 +
    2.17 +log: /tmp/bochsout.txt
    2.18 +#debug: action=report
    2.19 +info: action=report
    2.20 +error: action=report
    2.21 +panic: action=ask
    2.22 +
    2.23 +mouse: enabled=0