ia64/xen-unstable

changeset 3562:308203ddc173

bitkeeper revision 1.1159.223.48 (41f9204fFDaBv7jCdF63bwx5zXNlNA)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-2.0-testing.bk
author cl349@arcadians.cl.cam.ac.uk
date Thu Jan 27 17:09:35 2005 +0000 (2005-01-27)
parents 77732aef762e 0a8bc30a7c4b
children 2e60786262c4 9bf594bc4824
files Makefile linux-2.6.10-xen-sparse/arch/xen/Kconfig tools/examples/Makefile tools/libxc/Makefile tools/libxutil/Makefile tools/misc/Makefile tools/misc/miniterm/Makefile tools/sv/Makefile tools/xentrace/Makefile tools/xfrd/Makefile xen/Makefile
line diff
     1.1 --- a/Makefile	Thu Jan 27 16:02:39 2005 +0000
     1.2 +++ b/Makefile	Thu Jan 27 17:09:35 2005 +0000
     1.3 @@ -11,7 +11,7 @@ INSTALL_DIR	:= $(INSTALL) -d -m0755
     1.4  INSTALL_DATA	:= $(INSTALL) -m0644
     1.5  INSTALL_PROG	:= $(INSTALL) -m0755
     1.6  
     1.7 -KERNELS ?= *2.6*
     1.8 +KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
     1.9  # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
    1.10  # You may use wildcards in the above e.g. KERNELS=*2.4*
    1.11  
    1.12 @@ -30,20 +30,12 @@ endif
    1.13  include buildconfigs/Rules.mk
    1.14  
    1.15  .PHONY:	all dist install xen tools kernels docs world clean mkpatches mrproper
    1.16 -.PHONY:	kbuild kdelete kclean install-tools install-xen install-docs
    1.17 -.PHONY: install-kernels
    1.18 +.PHONY:	kbuild kdelete kclean
    1.19  
    1.20  all: dist
    1.21  
    1.22 -# install everything into the standard system directories
    1.23 -# NB: install explicitly does not check that everything is up to date!
    1.24 -install: DESTDIR=
    1.25 -install: xen checked-tools kernels docs
    1.26 -
    1.27 -# Only check for install req'mts on 'make install', not on 'make dist'.
    1.28 -checked-tools:
    1.29 -	$(MAKE) -C tools/check install
    1.30 -	$(MAKE) -C tools install
    1.31 +# build and install everything into the standard system directories
    1.32 +install: install-xen install-tools install-kernels install-docs
    1.33  
    1.34  # build and install everything into local dist directory
    1.35  dist: xen tools kernels docs
    1.36 @@ -118,9 +110,17 @@ install-iptables:
    1.37  	tar -jxf iptables-1.2.11.tar.bz2
    1.38  	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
    1.39  
    1.40 +install-%: DESTDIR=
    1.41 +install-%: %
    1.42 +	@: # do nothing
    1.43 +
    1.44  help:
    1.45  	@echo 'Installation targets:'
    1.46  	@echo '  install          - build and install everything'
    1.47 +	@echo '  install-xen      - build and install the Xen hypervisor'
    1.48 +	@echo '  install-tools    - build and install the control tools'
    1.49 +	@echo '  install-kernels  - build and install guest kernels'
    1.50 +	@echo '  install-docs     - build and install documentation'
    1.51  	@echo ''
    1.52  	@echo 'Building targets:'
    1.53  	@echo '  dist             - build and install everything into local dist directory'
    1.54 @@ -178,3 +178,4 @@ linux26:
    1.55  
    1.56  netbsd20:
    1.57  	$(MAKE) netbsd-2.0-xenU-build
    1.58 +
     2.1 --- a/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Thu Jan 27 16:02:39 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/Kconfig	Thu Jan 27 17:09:35 2005 +0000
     2.3 @@ -26,7 +26,7 @@ menu "XEN"
     2.4  config XEN_PRIVILEGED_GUEST
     2.5  	bool "Privileged Guest (domain 0)"
     2.6  	default n
     2.7 -        select XEN_PHYSDEV_ACCESS
     2.8 +	select XEN_PHYSDEV_ACCESS
     2.9  	help
    2.10  	  Support for privileged operation (domain 0)
    2.11  
    2.12 @@ -35,91 +35,91 @@ config XEN_PHYSDEV_ACCESS
    2.13  	default XEN_PRIVILEGED_GUEST
    2.14  	help
    2.15  	  Assume access is available to physical hardware devices
    2.16 -          (e.g., hard drives, network cards). This allows you to configure
    2.17 -          such devices and also includes some low-level support that is
    2.18 -          otherwise not compiled into the kernel.
    2.19 +	  (e.g., hard drives, network cards). This allows you to configure
    2.20 +	  such devices and also includes some low-level support that is
    2.21 +	  otherwise not compiled into the kernel.
    2.22  
    2.23  config XEN_BLKDEV_BACKEND
    2.24 -        bool "Block-device backend driver"
    2.25 -      depends on XEN_PHYSDEV_ACCESS
    2.26 -        default y
    2.27 -        help
    2.28 -          The block-device backend driver allows the kernel to export its
    2.29 -          block devices to other guests via a high-performance shared-memory
    2.30 -          interface.
    2.31 +	bool "Block-device backend driver"
    2.32 +	depends on XEN_PHYSDEV_ACCESS
    2.33 +	default y
    2.34 +	help
    2.35 +	  The block-device backend driver allows the kernel to export its
    2.36 +	  block devices to other guests via a high-performance shared-memory
    2.37 +	  interface.
    2.38  
    2.39  config XEN_NETDEV_BACKEND
    2.40 -        bool "Network-device backend driver"
    2.41 -      depends on XEN_PHYSDEV_ACCESS
    2.42 -        default y
    2.43 -        help
    2.44 -          The network-device backend driver allows the kernel to export its
    2.45 -          network devices to other guests via a high-performance shared-memory
    2.46 -          interface.
    2.47 +	bool "Network-device backend driver"
    2.48 +	depends on XEN_PHYSDEV_ACCESS
    2.49 +	default y
    2.50 +	help
    2.51 +	  The network-device backend driver allows the kernel to export its
    2.52 +	  network devices to other guests via a high-performance shared-memory
    2.53 +	  interface.
    2.54  
    2.55  config XEN_BLKDEV_FRONTEND
    2.56 -        bool "Block-device frontend driver"
    2.57 -        default y
    2.58 -        help
    2.59 -          The block-device frontend driver allows the kernel to access block
    2.60 -          devices mounted within another guest OS. Unless you are building a
    2.61 -          dedicated device-driver domain, or your master control domain
    2.62 -          (domain 0), then you almost certainly want to say Y here.
    2.63 +	bool "Block-device frontend driver"
    2.64 +	default y
    2.65 +	help
    2.66 +	  The block-device frontend driver allows the kernel to access block
    2.67 +	  devices mounted within another guest OS. Unless you are building a
    2.68 +	  dedicated device-driver domain, or your master control domain
    2.69 +	  (domain 0), then you almost certainly want to say Y here.
    2.70  
    2.71  config XEN_NETDEV_FRONTEND
    2.72 -        bool "Network-device frontend driver"
    2.73 -        default y
    2.74 -        help
    2.75 -          The network-device frontend driver allows the kernel to access
    2.76 -          network interfaces within another guest OS. Unless you are building a
    2.77 -          dedicated device-driver domain, or your master control domain
    2.78 -          (domain 0), then you almost certainly want to say Y here.
    2.79 +	bool "Network-device frontend driver"
    2.80 +	default y
    2.81 +	help
    2.82 +	  The network-device frontend driver allows the kernel to access
    2.83 +	  network interfaces within another guest OS. Unless you are building a
    2.84 +	  dedicated device-driver domain, or your master control domain
    2.85 +	  (domain 0), then you almost certainly want to say Y here.
    2.86  
    2.87  config XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER
    2.88 -        bool "Pipelined transmitter (DANGEROUS)"
    2.89 +	bool "Pipelined transmitter (DANGEROUS)"
    2.90  	depends on XEN_NETDEV_FRONTEND
    2.91 -        default n
    2.92 -        help
    2.93 -          The driver will assume that the backend is pipelining packets for
    2.94 -          transmission: whenever packets are pending in the remote backend,
    2.95 -          the driver will not send asynchronous notifications when it queues
    2.96 -          additional packets for transmission.
    2.97 -          If the backend is a dumb domain, such as a transparent Ethernet
    2.98 -          bridge with no local IP interface, it is safe to say Y here to get
    2.99 -          slightly lower network overhead.
   2.100 -          If the backend has a local IP interface; or may be doing smart things
   2.101 -          like reassembling packets to perform firewall filtering; or if you
   2.102 -          are unsure; or if you experience network hangs when this option is
   2.103 -          enabled; then you must say N here.
   2.104 +	default n
   2.105 +	help
   2.106 +	  The driver will assume that the backend is pipelining packets for
   2.107 +	  transmission: whenever packets are pending in the remote backend,
   2.108 +	  the driver will not send asynchronous notifications when it queues
   2.109 +	  additional packets for transmission.
   2.110 +	  If the backend is a dumb domain, such as a transparent Ethernet
   2.111 +	  bridge with no local IP interface, it is safe to say Y here to get
   2.112 +	  slightly lower network overhead.
   2.113 +	  If the backend has a local IP interface; or may be doing smart things
   2.114 +	  like reassembling packets to perform firewall filtering; or if you
   2.115 +	  are unsure; or if you experience network hangs when this option is
   2.116 +	  enabled; then you must say N here.
   2.117  
   2.118  config XEN_WRITABLE_PAGETABLES
   2.119  	bool
   2.120  	default y
   2.121  
   2.122  config XEN_SCRUB_PAGES
   2.123 -        bool "Scrub memory before freeing it to Xen"
   2.124 -        default y
   2.125 -        help
   2.126 -          Erase memory contents before freeing it back to Xen's global
   2.127 -          pool. This ensures that any secrets contained within that
   2.128 -          memory (e.g., private keys) cannot be found by other guests that
   2.129 -          may be running on the machine. Most people will want to say Y here.
   2.130 -          If security is not a concern then you may increase performance by
   2.131 -          saying N.
   2.132 +	bool "Scrub memory before freeing it to Xen"
   2.133 +	default y
   2.134 +	help
   2.135 +	  Erase memory contents before freeing it back to Xen's global
   2.136 +	  pool. This ensures that any secrets contained within that
   2.137 +	  memory (e.g., private keys) cannot be found by other guests that
   2.138 +	  may be running on the machine. Most people will want to say Y here.
   2.139 +	  If security is not a concern then you may increase performance by
   2.140 +	  saying N.
   2.141  
   2.142  choice
   2.143 -        prompt "Processor Type"
   2.144 -        default X86
   2.145 +	prompt "Processor Type"
   2.146 +	default X86
   2.147  
   2.148  config X86
   2.149 -        bool "X86"
   2.150 -        help
   2.151 -          Choose this option if your computer is a X86 architecture.
   2.152 +	bool "X86"
   2.153 +	help
   2.154 +	  Choose this option if your computer is a X86 architecture.
   2.155  
   2.156  config X86_64
   2.157 -        bool "X86_64"
   2.158 -        help
   2.159 -          Choose this option if your computer is a X86 architecture.
   2.160 +	bool "X86_64"
   2.161 +	help
   2.162 +	  Choose this option if your computer is a X86 architecture.
   2.163  
   2.164  endchoice
   2.165  
     3.1 --- a/tools/examples/Makefile	Thu Jan 27 16:02:39 2005 +0000
     3.2 +++ b/tools/examples/Makefile	Thu Jan 27 17:09:35 2005 +0000
     3.3 @@ -25,20 +25,23 @@ all:
     3.4  install: all install-initd install-configs install-scripts
     3.5  
     3.6  install-initd:
     3.7 -	$(INSTALL_DIR) $(DESTDIR)/etc/init.d
     3.8 +	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
     3.9  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
    3.10  	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
    3.11  
    3.12  install-configs:
    3.13 -	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
    3.14 -	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
    3.15 +	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
    3.16 +		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
    3.17 +	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
    3.18 +		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
    3.19  	for i in $(XEN_CONFIGS); \
    3.20  	    do [ -a $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \
    3.21  	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
    3.22  	done
    3.23  
    3.24  install-scripts:
    3.25 -	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    3.26 +	[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
    3.27 +		$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
    3.28  	for i in $(XEN_SCRIPTS); \
    3.29  	    do [ -a $(DESTDIR)$(XEN_SCRIPT_DIR)/$$i ] || \
    3.30  	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
     4.1 --- a/tools/libxc/Makefile	Thu Jan 27 16:02:39 2005 +0000
     4.2 +++ b/tools/libxc/Makefile	Thu Jan 27 17:09:35 2005 +0000
     4.3 @@ -66,8 +66,8 @@ mk-symlinks:
     4.4  	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
     4.5  
     4.6  install: all
     4.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/lib
     4.8 -	$(INSTALL_DIR) $(DESTDIR)/usr/include
     4.9 +	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) $(DESTDIR)/usr/lib
    4.10 +	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
    4.11  	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
    4.12  	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
    4.13  	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
     5.1 --- a/tools/libxutil/Makefile	Thu Jan 27 16:02:39 2005 +0000
     5.2 +++ b/tools/libxutil/Makefile	Thu Jan 27 17:09:35 2005 +0000
     5.3 @@ -63,7 +63,7 @@ check-for-zlib:
     5.4  	fi
     5.5  
     5.6  install: all
     5.7 -	$(INSTALL_DIR) -p $(DESTDIR)/usr/lib
     5.8 +	[ -d $(DESTDIR)/usr/lib ] || $(INSTALL_DIR) -p $(DESTDIR)/usr/lib
     5.9  	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
    5.10  	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
    5.11  	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
     6.1 --- a/tools/misc/Makefile	Thu Jan 27 16:02:39 2005 +0000
     6.2 +++ b/tools/misc/Makefile	Thu Jan 27 17:09:35 2005 +0000
     6.3 @@ -23,8 +23,8 @@ all: $(TARGETS)
     6.4  	$(MAKE) -C miniterm
     6.5  
     6.6  install: all
     6.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/bin
     6.8 -	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
     6.9 +	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    6.10 +	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
    6.11  	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
    6.12  	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
    6.13  #       No sense in installing miniterm on the Xen box.
     7.1 --- a/tools/misc/miniterm/Makefile	Thu Jan 27 16:02:39 2005 +0000
     7.2 +++ b/tools/misc/miniterm/Makefile	Thu Jan 27 17:09:35 2005 +0000
     7.3 @@ -9,7 +9,7 @@ TARGET = miniterm
     7.4  all: $(TARGET)
     7.5  
     7.6  install: all
     7.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/bin
     7.8 +	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
     7.9  	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
    7.10  
    7.11  clean:
     8.1 --- a/tools/sv/Makefile	Thu Jan 27 16:02:39 2005 +0000
     8.2 +++ b/tools/sv/Makefile	Thu Jan 27 17:09:35 2005 +0000
     8.3 @@ -17,15 +17,17 @@ IMAGES	+= next.png previous.png finish.p
     8.4  
     8.5  install:
     8.6  	# copy XenSV Main.rpy file
     8.7 -	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)
     8.8 +	@[ -d $(DESTDIR)$(sv_insdir) ] || $(INSTALL_DIR) $(DESTDIR)$(sv_insdir)
     8.9  	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)
    8.10  
    8.11  	# copy XenSV images
    8.12 -	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images
    8.13 +	@[ -d $(DESTDIR)$(sv_insdir)/images ] || \
    8.14 +		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images
    8.15  	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)
    8.16  
    8.17  	# copy XenSV stylesheet
    8.18 -	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc
    8.19 +	@[ -d $(DESTDIR)$(sv_insdir)/inc ] || \
    8.20 +		$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc
    8.21  	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc
    8.22  
    8.23  clean:
     9.1 --- a/tools/xentrace/Makefile	Thu Jan 27 16:02:39 2005 +0000
     9.2 +++ b/tools/xentrace/Makefile	Thu Jan 27 17:09:35 2005 +0000
     9.3 @@ -24,9 +24,11 @@ MAN8     = $(wildcard *.8)
     9.4  all: $(BIN)
     9.5  
     9.6  install: all
     9.7 -	$(INSTALL_DIR) $(DESTDIR)/usr/bin
     9.8 -	$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
     9.9 -	$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
    9.10 +	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
    9.11 +	[ -d $(DESTDIR)/usr/man/man1 ] || \
    9.12 +		$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
    9.13 +	[ -d $(DESTDIR)/usr/man/man8 ] || \
    9.14 +		$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
    9.15  	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
    9.16  	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1
    9.17  	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8
    10.1 --- a/tools/xfrd/Makefile	Thu Jan 27 16:02:39 2005 +0000
    10.2 +++ b/tools/xfrd/Makefile	Thu Jan 27 17:09:35 2005 +0000
    10.3 @@ -70,7 +70,8 @@ xfrd: $(XFRD_PROG_OBJ)
    10.4  
    10.5  .PHONY: install
    10.6  install: xfrd
    10.7 -	$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)
    10.8 +	[ -d $(DESTDIR)$(XFRD_INSTALL_DIR) ] || \
    10.9 +		$(INSTALL_DIR) $(DESTDIR)$(XFRD_INSTALL_DIR)
   10.10  	$(INSTALL_PROG) xfrd $(DESTDIR)$(XFRD_INSTALL_DIR)
   10.11  
   10.12  .PHONY: libutil
    11.1 --- a/xen/Makefile	Thu Jan 27 16:02:39 2005 +0000
    11.2 +++ b/xen/Makefile	Thu Jan 27 17:09:35 2005 +0000
    11.3 @@ -21,10 +21,11 @@ debug:
    11.4  	objdump -D -S $(TARGET)-syms > $(TARGET).s
    11.5  
    11.6  install: $(TARGET).gz
    11.7 -	$(INSTALL_DIR) $(DESTDIR)/boot
    11.8 +	[ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot
    11.9  	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot
   11.10  	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot
   11.11 -	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
   11.12 +	[ -d $(DESTDIR)/usr/include/xen/io ] || \
   11.13 +		$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
   11.14  	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
   11.15  	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
   11.16  	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen