direct-io.hg

changeset 5502:0d1166678d9b

bitkeeper revision 1.1719 (42b36f87tzUHBhdJfZKC_wBV271T0g)

manual merge
author iap10@freefall.cl.cam.ac.uk
date Sat Jun 18 00:49:11 2005 +0000 (2005-06-18)
parents 30735e9ca179 e6fd8713fa10
children 649cd37aa1ab
files BitKeeper/etc/logging_ok linux-2.6.11-xen-sparse/arch/xen/Makefile tools/libxc/xc.h tools/python/xen/xend/server/SrvConsole.py tools/python/xen/xend/server/SrvConsoleDir.py tools/python/xen/xend/server/SrvDmesg.py tools/python/xen/xend/server/SrvDomainDir.py tools/python/xen/xend/server/SrvNode.py tools/python/xen/xend/server/SrvVnetDir.py tools/python/xen/xend/server/SrvXendLog.py
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Fri Jun 17 22:54:26 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Sat Jun 18 00:49:11 2005 +0000
     1.3 @@ -28,6 +28,7 @@ djm@djmnc4000.(none)
     1.4  djm@kirby.fc.hp.com
     1.5  djm@sportsman.spdomain
     1.6  doogie@brainfood.com
     1.7 +dsteklof@us.ibm.com
     1.8  gm281@boulderdash.cl.cam.ac.uk
     1.9  gm281@tetrapod.cl.cam.ac.uk
    1.10  harry@dory.(none)
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile	Fri Jun 17 22:54:26 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile	Sat Jun 18 00:49:11 2005 +0000
     2.3 @@ -27,15 +27,17 @@ include/.asm-ignore: include/asm
     2.4  	@mv include/asm include/.asm-ignore
     2.5  	@echo '  SYMLINK include/asm -> include/asm-$(XENARCH)'
     2.6  	$(Q)if [ ! -d include ]; then mkdir -p include; fi;
     2.7 -	@ln -fsn asm-$(XENARCH) include/asm
     2.8 +	@ln -fsn $(srctree)/include/asm-$(XENARCH) include/asm
     2.9  
    2.10  include/asm-xen/asm:
    2.11  	@echo '  SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)'
    2.12 -	@ln -fsn asm-$(XENARCH) $@
    2.13 +	@mkdir -p include/asm-xen
    2.14 +	@ln -fsn $(srctree)/include/asm-xen/asm-$(XENARCH) $@
    2.15  
    2.16  arch/xen/arch:
    2.17  	@rm -f $@
    2.18 -	@ln -fsn $(XENARCH) $@
    2.19 +	@mkdir -p arch/xen
    2.20 +	@ln -fsn $(srctree)/arch/xen/$(XENARCH) $@
    2.21  
    2.22  arch/$(XENARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
    2.23  				   include/config/MARKER
     3.1 --- a/tools/libxc/xc.h	Fri Jun 17 22:54:26 2005 +0000
     3.2 +++ b/tools/libxc/xc.h	Sat Jun 18 00:49:11 2005 +0000
     3.3 @@ -169,7 +169,11 @@ int xc_domain_pincpu(int xc_handle,
     3.4                       int vcpu,
     3.5                       cpumap_t *cpumap);
     3.6  /**
     3.7 - * This function will return information about one or more domains.
     3.8 + * This function will return information about one or more domains. It is
     3.9 + * designed to iterate over the list of domains. If a single domain is
    3.10 + * requested, this function will return the next domain in the list - if
    3.11 + * one exists. It is, therefore, important in this case to make sure the
    3.12 + * domain requested was the one returned.
    3.13   *
    3.14   * @parm xc_handle a handle to an open hypervisor interface
    3.15   * @parm first_domid the first domain to enumerate information from.  Domains