1.1 --- a/Makefile	Tue Mar 23 11:18:17 2004 +0000
     1.2 +++ b/Makefile	Tue Mar 23 11:55:59 2004 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  
     1.5  # Grand Unified Makefile for Xen.
     1.6  #
     1.7 -# Builds everything except Xenolinux:
     1.8 +# Builds everything except Linux:
     1.9  #  cd xenolinux-<version>-sparse
    1.10  #  ./mkbuildtree <build dir>
    1.11  #  cd <build dir>

     2.1 --- a/tools/Makefile	Tue Mar 23 11:18:17 2004 +0000
     2.2 +++ b/tools/Makefile	Tue Mar 23 11:55:59 2004 +0000
     2.3 @@ -1,21 +1,3 @@
     2.4 -#
     2.5 -# Grand Unified Makefile for Xen.
     2.6 -#
     2.7 -# Keir Fraser, 6/5/2003
     2.8 -#
     2.9 -# Builds everything except Xenolinux:
    2.10 -#  cd xenolinux-<version>-sparse
    2.11 -#  ./mkbuildtree <build dir>
    2.12 -#  cd <build dir> && make oldconfig && make dep && make bzImage
    2.13 -#  (<build dir> should be a vanilla linux tree with matching version)
    2.14 -#
    2.15 -# If you get errors in tools/domctl or tools/vdmanager, then you need
    2.16 -# the latest Java 2 SDK on your execution path: <http://java.sun.com>
    2.17 -# Also, you will need Apache's 'ant' build tool: <http://ant.apache.org>
    2.18 -#
    2.19 -# If you received this source as part of a Xen release, you should find
    2.20 -# that appropriate versions of the build tools are already installed in
    2.21 -# the initial system setup.
    2.22  
    2.23  all:	
    2.24  	$(MAKE) -C balloon

     3.1 --- a/tools/balloon/README	Tue Mar 23 11:18:17 2004 +0000
     3.2 +++ b/tools/balloon/README	Tue Mar 23 11:55:59 2004 +0000
     3.3 @@ -1,17 +1,17 @@
     3.4 -Xeno Balloon driver supports two operations:
     3.5  
     3.6 -1. Inflating - which means domain giving up pages of mem to xen.
     3.7 -2. Deflating - which means reclaiming memory pages from xen.
     3.8 +The Xen balloon driver supports two operations:
     3.9 + 1. Inflating - which means domain giving up pages of memory to Xen.
    3.10 + 2. Deflating - which means reclaiming memory pages from Xen.
    3.11  
    3.12 -Currently, domain can only claim pages from xen up to the number of 
    3.13 +Currently a domain can only claim pages from Xen up to the number of 
    3.14  previously released ones. This is to change. 
    3.15  
    3.16  Example:
    3.17  
    3.18  # balloon inflate 1000
    3.19  
    3.20 -Give up 1000 pages to xen.
    3.21 +Give up 1000 pages to Xen.
    3.22  
    3.23  # balloon deflate 1000
    3.24  
    3.25 -Claim 1000 pages from xen.
    3.26 +Claim 1000 pages from Xen.

     4.1 --- a/tools/balloon/balloon.c	Tue Mar 23 11:18:17 2004 +0000
     4.2 +++ b/tools/balloon/balloon.c	Tue Mar 23 11:55:59 2004 +0000
     4.3 @@ -19,15 +19,14 @@
     4.4  #define INFLATE_BALLOON      "inflate"   /* return mem to hypervisor */
     4.5  #define DEFLATE_BALLOON      "deflate"   /* claim mem from hypervisor */
     4.6  
     4.7 -/* THIS IS TAKEN FROM XENOLINUX BALLOON DRIVER */
     4.8 +/* THIS IS SHARED WITH THE LINUX BALLOON DRIVER */
     4.9  #define USER_INFLATE_BALLOON  1   /* return mem to hypervisor */
    4.10  #define USER_DEFLATE_BALLOON  2   /* claim mem from hypervisor */
    4.11  typedef struct user_balloon_op {
    4.12      unsigned int    op;
    4.13      unsigned long   size;
    4.14  } user_balloon_op_t;
    4.15 -/* END OF CODE TAKEN FROM XENOLINUX BALLOON DRIVER */
    4.16 -
    4.17 +/* END OF CODE SHARED WITH THE LINUX BALLOON DRIVER */
    4.18  
    4.19  static int open_balloon_proc()
    4.20  {

     5.1 --- a/tools/xc/lib/xc_linux_restore.c	Tue Mar 23 11:18:17 2004 +0000
     5.2 +++ b/tools/xc/lib/xc_linux_restore.c	Tue Mar 23 11:55:59 2004 +0000
     5.3 @@ -62,7 +62,7 @@ int xc_linux_restore(int xc_handle,
     5.4      u64 dom = 0ULL;
     5.5      unsigned int prev_pc, this_pc;
     5.6      
     5.7 -    /* Number of page frames in use by this XenoLinux session. */
     5.8 +    /* Number of page frames in use by this Linux session. */
     5.9      unsigned long nr_pfns;
    5.10  
    5.11      /* The new domain's shared-info frame number. */
    5.12 @@ -72,7 +72,7 @@ int xc_linux_restore(int xc_handle,
    5.13      /* A copy of the CPU context of the guest. */
    5.14      full_execution_context_t ctxt;
    5.15  
    5.16 -    /* First 16 bytes of the state file must contain 'XenoLinuxSuspend'. */
    5.17 +    /* First 16 bytes of the state file must contain 'LinuxGuestRecord'. */
    5.18      char signature[16];
    5.19      
    5.20      /* A copy of the domain's name. */
    5.21 @@ -116,7 +116,7 @@ int xc_linux_restore(int xc_handle,
    5.22  
    5.23      /* Start writing out the saved-domain record. */
    5.24      if ( !checked_read(gfd, signature, 16) ||
    5.25 -         (memcmp(signature, "XenoLinuxSuspend", 16) != 0) )
    5.26 +         (memcmp(signature, "LinuxGuestRecord", 16) != 0) )
    5.27      {
    5.28          ERROR("Unrecognised state format -- no signature found");
    5.29          goto out;

     6.1 --- a/tools/xc/lib/xc_linux_save.c	Tue Mar 23 11:18:17 2004 +0000
     6.2 +++ b/tools/xc/lib/xc_linux_save.c	Tue Mar 23 11:55:59 2004 +0000
     6.3 @@ -174,7 +174,7 @@ int xc_linux_save(int xc_handle,
     6.4      /* A cheesy test to see whether the domain contains valid state. */
     6.5      if ( ctxt.pt_base == 0 )
     6.6      {
     6.7 -        ERROR("Domain is not in a valid Xenolinux state");
     6.8 +        ERROR("Domain is not in a valid Linux guest OS state");
     6.9          goto out;
    6.10      }
    6.11  
    6.12 @@ -308,7 +308,7 @@ int xc_linux_save(int xc_handle,
    6.13  
    6.14      /* Start writing out the saved-domain record. */
    6.15      ppage = map_pfn_readonly(pm_handle, shared_info_frame);
    6.16 -    if ( !checked_write(gfd, "XenoLinuxSuspend",    16) ||
    6.17 +    if ( !checked_write(gfd, "LinuxGuestRecord",    16) ||
    6.18           !checked_write(gfd, name,                  sizeof(name)) ||
    6.19           !checked_write(gfd, &srec.nr_pfns,         sizeof(unsigned long)) ||
    6.20           !checked_write(gfd, &ctxt,                 sizeof(ctxt)) ||