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
2.1 --- a/freebsd-5.3-xen-sparse/fbsdxensetup Fri Jul 01 12:30:19 2005 +0000 2.2 +++ b/freebsd-5.3-xen-sparse/fbsdxensetup Fri Jul 01 12:45:24 2005 +0000 2.3 @@ -1,6 +1,11 @@ 2.4 #!/bin/csh -f 2.5 2.6 -setenv XENROOT `bk root` 2.7 +setenv XENROOT `pwd` 2.8 +cd $XENROOT 2.9 +if ( ! -d freebsd-5.3-xen-sparse ) then 2.10 + echo "Please run this script from the root of the Xen source tree" 2.11 + exit 1 2.12 +endif 2.13 rm -rf $XENROOT/fbsdtmp $XENROOT/freebsd-5.3-xenU 2.14 mkdir -p $XENROOT/fbsdtmp 2.15 cd $XENROOT/fbsdtmp
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/tools/examples/bochsrc Fri Jul 01 12:45:24 2005 +0000 4.3 @@ -0,0 +1,20 @@ 4.4 +#megs: 32 4.5 +#romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000 4.6 +#vgaromimage: $BXSHARE/VGABIOS-lgpl-latest 4.7 +floppya: 1_44=a.img, status=inserted 4.8 +floppyb: 1_44=b.img, status=inserted 4.9 +# if you don't use absolute paths below, bochs looks under the cwd of xend, 4.10 +# which is usually "/" 4.11 +#ata0-master: type=disk, path=/var/images/min-el3-i386.img, cylinders=800, heads=4, spt=32 4.12 +i440fxsupport: enabled=1 4.13 +ne2k: ioaddr=0x300, irq=9, mac=b0:c4:22:01:00:00, ethmod=linux, ethdev=eth0 4.14 +ata0-master: type=disk, path=/var/images/1g-el3-i386.img, mode=flat, cylinders=2048, heads=16, spt=63 4.15 +boot: c 4.16 + 4.17 +log: /tmp/bochsout.txt 4.18 +#debug: action=report 4.19 +info: action=report 4.20 +error: action=report 4.21 +panic: action=ask 4.22 + 4.23 +mouse: enabled=0