diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-06-18 00:49:11 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-06-18 00:49:11 +0000 |
| commit | 0338f79f59e6ab68f5d3c37fa7a1108f0bc70918 (patch) | |
| tree | ed0c61d8de683822a7415e6def823fcee0e7db50 | |
| parent | 85b8054cebe256d496b48d6313485c18cf02115d (diff) | |
| parent | ac5c611d7815fa57817241e7a7ea06f66ec16ddb (diff) | |
| download | xen-0338f79f59e6ab68f5d3c37fa7a1108f0bc70918.tar.gz xen-0338f79f59e6ab68f5d3c37fa7a1108f0bc70918.tar.bz2 xen-0338f79f59e6ab68f5d3c37fa7a1108f0bc70918.zip | |
bitkeeper revision 1.1719 (42b36f87tzUHBhdJfZKC_wBV271T0g)
manual merge
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | linux-2.6.11-xen-sparse/arch/xen/Makefile | 8 | ||||
| -rw-r--r-- | tools/libxc/xc.h | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index afc6cd647f..2443869070 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -28,6 +28,7 @@ djm@djmnc4000.(none) djm@kirby.fc.hp.com djm@sportsman.spdomain doogie@brainfood.com +dsteklof@us.ibm.com gm281@boulderdash.cl.cam.ac.uk gm281@tetrapod.cl.cam.ac.uk harry@dory.(none) diff --git a/linux-2.6.11-xen-sparse/arch/xen/Makefile b/linux-2.6.11-xen-sparse/arch/xen/Makefile index 378dba9615..159006083d 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile @@ -27,15 +27,17 @@ include/.asm-ignore: include/asm @mv include/asm include/.asm-ignore @echo ' SYMLINK include/asm -> include/asm-$(XENARCH)' $(Q)if [ ! -d include ]; then mkdir -p include; fi; - @ln -fsn asm-$(XENARCH) include/asm + @ln -fsn $(srctree)/include/asm-$(XENARCH) include/asm include/asm-xen/asm: @echo ' SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)' - @ln -fsn asm-$(XENARCH) $@ + @mkdir -p include/asm-xen + @ln -fsn $(srctree)/include/asm-xen/asm-$(XENARCH) $@ arch/xen/arch: @rm -f $@ - @ln -fsn $(XENARCH) $@ + @mkdir -p arch/xen + @ln -fsn $(srctree)/arch/xen/$(XENARCH) $@ arch/$(XENARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ include/config/MARKER diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h index 27e7845798..3123d6e5a4 100644 --- a/tools/libxc/xc.h +++ b/tools/libxc/xc.h @@ -169,7 +169,11 @@ int xc_domain_pincpu(int xc_handle, int vcpu, cpumap_t *cpumap); /** - * This function will return information about one or more domains. + * This function will return information about one or more domains. It is + * designed to iterate over the list of domains. If a single domain is + * requested, this function will return the next domain in the list - if + * one exists. It is, therefore, important in this case to make sure the + * domain requested was the one returned. * * @parm xc_handle a handle to an open hypervisor interface * @parm first_domid the first domain to enumerate information from. Domains |