direct-io.hg

changeset 5624:77f397603f71

Device model path cleanup. Remove bochsrc which is no longer needed.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 01 10:34:47 2005 +0000 (2005-07-01)
parents ef2adae89e4d
children 5aaebfc580a6
files tools/examples/Makefile tools/examples/xmexample.vmx tools/ioemu/target-i386-dm/Makefile
line diff
     1.1 --- a/tools/examples/Makefile	Fri Jul 01 10:28:14 2005 +0000
     1.2 +++ b/tools/examples/Makefile	Fri Jul 01 10:34:47 2005 +0000
     1.3 @@ -13,8 +13,6 @@ XEN_CONFIGS = xend-config.sxp
     1.4  XEN_CONFIGS += xmexample1 
     1.5  XEN_CONFIGS += xmexample2
     1.6  XEN_CONFIGS += xmexample.vmx
     1.7 -XEN_CONFIGS += mem-map.sxp
     1.8 -XEN_CONFIGS += bochsrc
     1.9  
    1.10  # Xen script dir and scripts to go there.
    1.11  XEN_SCRIPT_DIR = /etc/xen/scripts
    1.12 @@ -23,10 +21,13 @@ XEN_SCRIPTS += network-route vif-route
    1.13  XEN_SCRIPTS += block-file
    1.14  XEN_SCRIPTS += block-enbd
    1.15  
    1.16 +XEN_BOOT_DIR = /usr/lib/xen/boot
    1.17 +XEN_BOOT = mem-map.sxp
    1.18 +
    1.19  all: 
    1.20  build:
    1.21  
    1.22 -install: all install-initd install-configs install-scripts
    1.23 +install: all install-initd install-configs install-scripts install-boot
    1.24  
    1.25  install-initd:
    1.26  	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
    1.27 @@ -51,4 +52,12 @@ install-scripts:
    1.28  	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
    1.29  	done
    1.30  
    1.31 +install-boot:
    1.32 +	[ -d $(DESTDIR)$(XEN_BOOT_DIR) ] || \
    1.33 +		$(INSTALL_DIR) $(DESTDIR)$(XEN_BOOT_DIR)
    1.34 +	for i in $(XEN_BOOT); \
    1.35 +	    do [ -a $(DESTDIR)$(XEN_BOOT_DIR)/$$i ] || \
    1.36 +	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_BOOT_DIR); \
    1.37 +	done
    1.38 +
    1.39  clean:
     2.1 --- a/tools/examples/bochsrc	Fri Jul 01 10:28:14 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,20 +0,0 @@
     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
     3.1 --- a/tools/examples/xmexample.vmx	Fri Jul 01 10:28:14 2005 +0000
     3.2 +++ b/tools/examples/xmexample.vmx	Fri Jul 01 10:34:47 2005 +0000
     3.3 @@ -89,10 +89,10 @@ root = "/dev/hda1 ro"
     3.4  
     3.5  
     3.6  # New stuff
     3.7 -device_model = '/usr/bin/qemu-dm'
     3.8 +device_model = '/usr/lib/xen/bin/qemu-dm'
     3.9  
    3.10  # Advanced users only. Don't touch if you don't know what you're doing
    3.11 -memmap = '/etc/xen/mem-map.sxp'
    3.12 +memmap = '/usr/lib/xen/boot/mem-map.sxp'
    3.13  
    3.14  #-----------------------------------------------------------------------------
    3.15  # Disk image for 
     4.1 --- a/tools/ioemu/target-i386-dm/Makefile	Fri Jul 01 10:28:14 2005 +0000
     4.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Fri Jul 01 10:34:47 2005 +0000
     4.3 @@ -3,12 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
     4.4  include config.mak
     4.5  override TARGET_ARCH=i386
     4.6  
     4.7 -#assume we directly put qemu code in tools/, same level as bochs dm(ioemu)
     4.8 -XEN_PATH=../../..
     4.9 +INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
    4.10  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
    4.11  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
    4.12 -DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_PATH)/xen/include/public
    4.13 -DEFINES+= -I$(XEN_PATH)/tools/libxc
    4.14 +DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
    4.15 +DEFINES+= -I$(XEN_ROOT)/tools/libxc
    4.16  ifdef CONFIG_USER_ONLY
    4.17  VPATH+=:$(SRC_PATH)/linux-user
    4.18  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
    4.19 @@ -32,7 +31,7 @@ QEMU_SYSTEM=qemu-fast
    4.20  endif
    4.21  
    4.22  QEMU_SYSTEM=qemu-dm
    4.23 -PROGS=$(QEMU_SYSTEM)
    4.24 +PROGS=$(QEMU_SYSTEM) $(QEMU_SYSTEM).debug
    4.25  
    4.26  ifdef CONFIG_USER_ONLY
    4.27  PROGS=$(QEMU_USER)
    4.28 @@ -383,12 +382,11 @@ distclean:
    4.29  	rm -rf *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe slirp qemu-vgaram-bin
    4.30  
    4.31  install: all 
    4.32 -	if [ ! -d $(DESTDIR)$(bindir) ];then mkdir -p $(DESTDIR)$(bindir);fi
    4.33 +	if [ ! -d $(INSTALL_DIR) ];then mkdir -p $(INSTALL_DIR);fi
    4.34  	if [ ! -d $(DESTDIR)$(configdir) ];then mkdir -p $(DESTDIR)$(configdir);fi
    4.35  ifneq ($(PROGS),)
    4.36 -	install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
    4.37 +	install -m 755 -s $(PROGS) "$(INSTALL_DIR)"
    4.38  endif
    4.39 -	install -m 755 qemu-dm.debug "$(DESTDIR)$(bindir)"
    4.40  	install -m 755 qemu-ifup "$(DESTDIR)$(configdir)"
    4.41  	gunzip -c qemu-vgaram-bin.gz >qemu-vgaram-bin 
    4.42  	install -m 755 qemu-vgaram-bin "$(DESTDIR)$(configdir)"