diff options
author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-23 11:55:59 +0000 |
---|---|---|
committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-03-23 11:55:59 +0000 |
commit | 16b5a63e564f7dd9644a1c48a3439cb4d7466c67 (patch) | |
tree | 4070fda17049b6d8ec5c5d7f953944841668c0df /tools | |
parent | f914ededc51e14f29b074c98eafd845903096c91 (diff) | |
download | xen-16b5a63e564f7dd9644a1c48a3439cb4d7466c67.tar.gz xen-16b5a63e564f7dd9644a1c48a3439cb4d7466c67.tar.bz2 xen-16b5a63e564f7dd9644a1c48a3439cb4d7466c67.zip |
bitkeeper revision 1.825 (406025cfC03xuc67hhXT_zgB13escw)
xc_linux_save.c, xc_linux_restore.c, balloon.c, README, Makefile:
xeno -> xen renames.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 18 | ||||
-rw-r--r-- | tools/balloon/README | 12 | ||||
-rw-r--r-- | tools/balloon/balloon.c | 5 | ||||
-rw-r--r-- | tools/xc/lib/xc_linux_restore.c | 6 | ||||
-rw-r--r-- | tools/xc/lib/xc_linux_save.c | 4 |
5 files changed, 13 insertions, 32 deletions
diff --git a/tools/Makefile b/tools/Makefile index 3bc0d81eaf..0d4c43fb24 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,21 +1,3 @@ -# -# Grand Unified Makefile for Xen. -# -# Keir Fraser, 6/5/2003 -# -# Builds everything except Xenolinux: -# cd xenolinux-<version>-sparse -# ./mkbuildtree <build dir> -# cd <build dir> && make oldconfig && make dep && make bzImage -# (<build dir> should be a vanilla linux tree with matching version) -# -# If you get errors in tools/domctl or tools/vdmanager, then you need -# the latest Java 2 SDK on your execution path: <http://java.sun.com> -# Also, you will need Apache's 'ant' build tool: <http://ant.apache.org> -# -# If you received this source as part of a Xen release, you should find -# that appropriate versions of the build tools are already installed in -# the initial system setup. all: $(MAKE) -C balloon diff --git a/tools/balloon/README b/tools/balloon/README index 430e8f41bf..16c1707b2e 100644 --- a/tools/balloon/README +++ b/tools/balloon/README @@ -1,17 +1,17 @@ -Xeno Balloon driver supports two operations: -1. Inflating - which means domain giving up pages of mem to xen. -2. Deflating - which means reclaiming memory pages from xen. +The Xen balloon driver supports two operations: + 1. Inflating - which means domain giving up pages of memory to Xen. + 2. Deflating - which means reclaiming memory pages from Xen. -Currently, domain can only claim pages from xen up to the number of +Currently a domain can only claim pages from Xen up to the number of previously released ones. This is to change. Example: # balloon inflate 1000 -Give up 1000 pages to xen. +Give up 1000 pages to Xen. # balloon deflate 1000 -Claim 1000 pages from xen. +Claim 1000 pages from Xen. diff --git a/tools/balloon/balloon.c b/tools/balloon/balloon.c index a8b6c406df..e305de5876 100644 --- a/tools/balloon/balloon.c +++ b/tools/balloon/balloon.c @@ -19,15 +19,14 @@ #define INFLATE_BALLOON "inflate" /* return mem to hypervisor */ #define DEFLATE_BALLOON "deflate" /* claim mem from hypervisor */ -/* THIS IS TAKEN FROM XENOLINUX BALLOON DRIVER */ +/* THIS IS SHARED WITH THE LINUX BALLOON DRIVER */ #define USER_INFLATE_BALLOON 1 /* return mem to hypervisor */ #define USER_DEFLATE_BALLOON 2 /* claim mem from hypervisor */ typedef struct user_balloon_op { unsigned int op; unsigned long size; } user_balloon_op_t; -/* END OF CODE TAKEN FROM XENOLINUX BALLOON DRIVER */ - +/* END OF CODE SHARED WITH THE LINUX BALLOON DRIVER */ static int open_balloon_proc() { diff --git a/tools/xc/lib/xc_linux_restore.c b/tools/xc/lib/xc_linux_restore.c index c82bb5c10d..d06804ed93 100644 --- a/tools/xc/lib/xc_linux_restore.c +++ b/tools/xc/lib/xc_linux_restore.c @@ -62,7 +62,7 @@ int xc_linux_restore(int xc_handle, u64 dom = 0ULL; unsigned int prev_pc, this_pc; - /* Number of page frames in use by this XenoLinux session. */ + /* Number of page frames in use by this Linux session. */ unsigned long nr_pfns; /* The new domain's shared-info frame number. */ @@ -72,7 +72,7 @@ int xc_linux_restore(int xc_handle, /* A copy of the CPU context of the guest. */ full_execution_context_t ctxt; - /* First 16 bytes of the state file must contain 'XenoLinuxSuspend'. */ + /* First 16 bytes of the state file must contain 'LinuxGuestRecord'. */ char signature[16]; /* A copy of the domain's name. */ @@ -116,7 +116,7 @@ int xc_linux_restore(int xc_handle, /* Start writing out the saved-domain record. */ if ( !checked_read(gfd, signature, 16) || - (memcmp(signature, "XenoLinuxSuspend", 16) != 0) ) + (memcmp(signature, "LinuxGuestRecord", 16) != 0) ) { ERROR("Unrecognised state format -- no signature found"); goto out; diff --git a/tools/xc/lib/xc_linux_save.c b/tools/xc/lib/xc_linux_save.c index 5168a58bd2..a702a4a292 100644 --- a/tools/xc/lib/xc_linux_save.c +++ b/tools/xc/lib/xc_linux_save.c @@ -174,7 +174,7 @@ int xc_linux_save(int xc_handle, /* A cheesy test to see whether the domain contains valid state. */ if ( ctxt.pt_base == 0 ) { - ERROR("Domain is not in a valid Xenolinux state"); + ERROR("Domain is not in a valid Linux guest OS state"); goto out; } @@ -308,7 +308,7 @@ int xc_linux_save(int xc_handle, /* Start writing out the saved-domain record. */ ppage = map_pfn_readonly(pm_handle, shared_info_frame); - if ( !checked_write(gfd, "XenoLinuxSuspend", 16) || + if ( !checked_write(gfd, "LinuxGuestRecord", 16) || !checked_write(gfd, name, sizeof(name)) || !checked_write(gfd, &srec.nr_pfns, sizeof(unsigned long)) || !checked_write(gfd, &ctxt, sizeof(ctxt)) || |