direct-io.hg

changeset 5626:5aaebfc580a6

manual merge
author iap10@freefall.cl.cam.ac.uk
date Fri Jul 01 10:55:46 2005 +0000 (2005-07-01)
parents 0f2fa1235851 77f397603f71
children 61df3453426c
files Makefile docs/misc/hg-cheatsheet.txt tools/examples/Makefile tools/examples/xmexample.vmx tools/ioemu/target-i386-dm/Makefile tools/misc/xen-clone xen/Makefile
line diff
     3.1 --- a/tools/examples/Makefile	Fri Jul 01 10:52:07 2005 +0000
     3.2 +++ b/tools/examples/Makefile	Fri Jul 01 10:55:46 2005 +0000
     3.3 @@ -13,8 +13,6 @@ XEN_CONFIGS = xend-config.sxp
     3.4  XEN_CONFIGS += xmexample1 
     3.5  XEN_CONFIGS += xmexample2
     3.6  XEN_CONFIGS += xmexample.vmx
     3.7 -XEN_CONFIGS += mem-map.sxp
     3.8 -XEN_CONFIGS += bochsrc
     3.9  
    3.10  # Xen script dir and scripts to go there.
    3.11  XEN_SCRIPT_DIR = /etc/xen/scripts
    3.12 @@ -23,10 +21,13 @@ XEN_SCRIPTS += network-route vif-route
    3.13  XEN_SCRIPTS += block-file
    3.14  XEN_SCRIPTS += block-enbd
    3.15  
    3.16 +XEN_BOOT_DIR = /usr/lib/xen/boot
    3.17 +XEN_BOOT = mem-map.sxp
    3.18 +
    3.19  all: 
    3.20  build:
    3.21  
    3.22 -install: all install-initd install-configs install-scripts
    3.23 +install: all install-initd install-configs install-scripts install-boot
    3.24  
    3.25  install-initd:
    3.26  	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
    3.27 @@ -51,4 +52,12 @@ install-scripts:
    3.28  	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
    3.29  	done
    3.30  
    3.31 +install-boot:
    3.32 +	[ -d $(DESTDIR)$(XEN_BOOT_DIR) ] || \
    3.33 +		$(INSTALL_DIR) $(DESTDIR)$(XEN_BOOT_DIR)
    3.34 +	for i in $(XEN_BOOT); \
    3.35 +	    do [ -a $(DESTDIR)$(XEN_BOOT_DIR)/$$i ] || \
    3.36 +	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_BOOT_DIR); \
    3.37 +	done
    3.38 +
    3.39  clean:
     4.1 --- a/tools/examples/bochsrc	Fri Jul 01 10:52:07 2005 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,20 +0,0 @@
     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
     5.1 --- a/tools/examples/xmexample.vmx	Fri Jul 01 10:52:07 2005 +0000
     5.2 +++ b/tools/examples/xmexample.vmx	Fri Jul 01 10:55:46 2005 +0000
     5.3 @@ -89,10 +89,10 @@ root = "/dev/hda1 ro"
     5.4  
     5.5  
     5.6  # New stuff
     5.7 -device_model = '/usr/bin/qemu-dm'
     5.8 +device_model = '/usr/lib/xen/bin/qemu-dm'
     5.9  
    5.10  # Advanced users only. Don't touch if you don't know what you're doing
    5.11 -memmap = '/etc/xen/mem-map.sxp'
    5.12 +memmap = '/usr/lib/xen/boot/mem-map.sxp'
    5.13  
    5.14  #-----------------------------------------------------------------------------
    5.15  # Disk image for 
     6.1 --- a/tools/ioemu/target-i386-dm/Makefile	Fri Jul 01 10:52:07 2005 +0000
     6.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Fri Jul 01 10:55:46 2005 +0000
     6.3 @@ -3,12 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
     6.4  include config.mak
     6.5  override TARGET_ARCH=i386
     6.6  
     6.7 -#assume we directly put qemu code in tools/, same level as bochs dm(ioemu)
     6.8 -XEN_PATH=../../..
     6.9 +INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
    6.10  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
    6.11  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
    6.12 -DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_PATH)/xen/include/public
    6.13 -DEFINES+= -I$(XEN_PATH)/tools/libxc
    6.14 +DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
    6.15 +DEFINES+= -I$(XEN_ROOT)/tools/libxc
    6.16  ifdef CONFIG_USER_ONLY
    6.17  VPATH+=:$(SRC_PATH)/linux-user
    6.18  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
    6.19 @@ -32,7 +31,7 @@ QEMU_SYSTEM=qemu-fast
    6.20  endif
    6.21  
    6.22  QEMU_SYSTEM=qemu-dm
    6.23 -PROGS=$(QEMU_SYSTEM)
    6.24 +PROGS=$(QEMU_SYSTEM) $(QEMU_SYSTEM).debug
    6.25  
    6.26  ifdef CONFIG_USER_ONLY
    6.27  PROGS=$(QEMU_USER)
    6.28 @@ -383,12 +382,11 @@ distclean:
    6.29  	rm -rf *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe slirp qemu-vgaram-bin
    6.30  
    6.31  install: all 
    6.32 -	if [ ! -d $(DESTDIR)$(bindir) ];then mkdir -p $(DESTDIR)$(bindir);fi
    6.33 +	if [ ! -d $(INSTALL_DIR) ];then mkdir -p $(INSTALL_DIR);fi
    6.34  	if [ ! -d $(DESTDIR)$(configdir) ];then mkdir -p $(DESTDIR)$(configdir);fi
    6.35  ifneq ($(PROGS),)
    6.36 -	install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
    6.37 +	install -m 755 -s $(PROGS) "$(INSTALL_DIR)"
    6.38  endif
    6.39 -	install -m 755 qemu-dm.debug "$(DESTDIR)$(bindir)"
    6.40  	install -m 755 qemu-ifup "$(DESTDIR)$(configdir)"
    6.41  	gunzip -c qemu-vgaram-bin.gz >qemu-vgaram-bin 
    6.42  	install -m 755 qemu-vgaram-bin "$(DESTDIR)$(configdir)"
     8.1 --- a/xen/Makefile	Fri Jul 01 10:52:07 2005 +0000
     8.2 +++ b/xen/Makefile	Fri Jul 01 10:55:46 2005 +0000
     8.3 @@ -97,7 +97,7 @@ include/xen/compile.h: include/xen/compi
     8.4  	    -e 's/@@version@@/$(XEN_VERSION)/g' \
     8.5  	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
     8.6  	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
     8.7 -	    -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)!g' \
     8.8 +	    -e 's!@@changeset@@!$(shell (hg tip | awk '/changeset/{CS=$$2};{FS="date:[ ]+"}/date/{D=$$2}; END {print D, CS}') 2>/dev/null || echo information unavailable)!g' \
     8.9  	    < include/xen/compile.h.in > $@.new
    8.10  	@cat include/xen/banner.h >> $@.new
    8.11  	@mv -f $@.new $@