ia64/xen-unstable

changeset 2387:bcc898397e06

bitkeeper revision 1.1159.53.22 (4130abdcusaonRO7iGNuw27bvn_UVw)

Merge ssh://srg//auto/groups/xeno/BK/xeno.bk
into equilibrium.research:/home/irchomes/mwilli2/x.bk
author mwilli2@equilibrium.research
date Sat Aug 28 15:59:24 2004 +0000 (2004-08-28)
parents eb30ab8d0c31 ce1a57f8737a
children ce02eefdecd0 67172d807d37
files BitKeeper/etc/logging_ok README README.CD docs/HOWTOs/Console-HOWTO docs/interface.tex docs/user.tex linux-2.4.27-xen-sparse/arch/xen/kernel/head.S linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S tools/libxc/xc_linux_build.c xen/Makefile xen/common/elf.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Sat Aug 28 09:23:15 2004 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Sat Aug 28 15:59:24 2004 +0000
     1.3 @@ -28,6 +28,7 @@ laudney@eclipse.(none)
     1.4  lynx@idefix.cl.cam.ac.uk
     1.5  maw48@labyrinth.cl.cam.ac.uk
     1.6  mjw@wray-m-3.hpl.hp.com
     1.7 +mwilli2@equilibrium.research
     1.8  mwilli2@equilibrium.research.intel-research.net
     1.9  rac61@labyrinth.cl.cam.ac.uk
    1.10  rgr22@boulderdash.cl.cam.ac.uk
     2.1 --- a/README	Sat Aug 28 09:23:15 2004 +0000
     2.2 +++ b/README	Sat Aug 28 15:59:24 2004 +0000
     2.3 @@ -1,14 +1,14 @@
     2.4 -#############################
     2.5 - __  __            _   _____ 
     2.6 - \ \/ /___ _ __   / | |___ / 
     2.7 -  \  // _ \ '_ \  | |   |_ \ 
     2.8 -  /  \  __/ | | | | |_ ___) |
     2.9 - /_/\_\___|_| |_| |_(_)____/ 
    2.10 -                                              
    2.11 -#############################
    2.12 +###############################
    2.13 +__  __            ____    ___
    2.14 +\ \/ /___ _ __   |___ \  / _ \
    2.15 + \  // _ \ '_ \    __) || | | |
    2.16 + /  \  __/ | | |  / __/ | |_| |
    2.17 +/_/\_\___|_| |_| |_____(_)___/
    2.18 +
    2.19 +###############################
    2.20  
    2.21  University of Cambridge Computer Laboratory
    2.22 -15 Jun 2004
    2.23 +28 Aug 2004
    2.24  
    2.25  http://www.cl.cam.ac.uk/netos/xen
    2.26  
    2.27 @@ -149,10 +149,10 @@ Building Xen and XenLinux
    2.28  =========================
    2.29  
    2.30  The public master BK repository for the 2.0 release lives at: 
    2.31 -bk://xen.bkbits.net/xeno-2.0.bk
    2.32 +bk://xen.bkbits.net/xen-2.0.bk
    2.33  
    2.34  To fetch a local copy, install the BitKeeper tools, then run: 
    2.35 -'bk clone bk://xen.bkbits.net/xeno-2.0.bk'
    2.36 +'bk clone bk://xen.bkbits.net/xen-2.0.bk'
    2.37  
    2.38  You can do a complete build of Xen, the control tools, and the
    2.39  XenLinux kernel images with "make world". This can take 10 minutes
    2.40 @@ -164,8 +164,8 @@ can then install everything to the stand
    2.41  
    2.42  Take a look in install/boot/:
    2.43   install/boot/xen.gz               The Xen 'kernel' (formerly image.gz)
    2.44 - install/boot/vmlinuz-2.4.26-xen0  Domain 0 XenLinux kernel (xenolinux.gz)
    2.45 - install/boot/vmlinuz-2.4.26-xenU  Unprivileged XenLinux kernel
    2.46 + install/boot/vmlinuz-2.4.27-xen0  Domain 0 XenLinux kernel (xenolinux.gz)
    2.47 + install/boot/vmlinuz-2.4.27-xenU  Unprivileged XenLinux kernel
    2.48  
    2.49  The difference between the two Linux kernels that are built is
    2.50  due to the configuration file used for each. The "U" suffixed
    2.51 @@ -176,7 +176,7 @@ your non-privileged domains.
    2.52  The install/boot directory will also contain the config files
    2.53  used for building the XenLinux kernels, and also versions of Xen
    2.54  and XenLinux kernels that contain debug symbols (xen-syms and
    2.55 -vmlinux-syms-2.4.26-xen0) which are essential for interpreting crash
    2.56 +vmlinux-syms-2.4.27-xen0) which are essential for interpreting crash
    2.57  dumps.
    2.58  
    2.59  Inspect the Makefile if you want to see what goes on during a
    2.60 @@ -185,7 +185,7 @@ more complicated. The makefile needs a '
    2.61  which it will then add the Xen architecture files to. You can tell the
    2.62  makefile the location of the appropriate linux compressed tar file by
    2.63  setting the LINUX_SRC environment variable
    2.64 -(e.g. "LINUX_SRC=/tmp/linux-2.4.26.tar.gz make world") or by placing
    2.65 +(e.g. "LINUX_SRC=/tmp/linux-2.4.27.tar.gz make world") or by placing
    2.66  the tar file somewhere in the search path of LINUX_SRC_PATH which
    2.67  defaults to ".:..". If the makefile can't find a suitable kernel tar
    2.68  file it attempts to download it from kernel.org, but this won't work
     3.1 --- a/README.CD	Sat Aug 28 09:23:15 2004 +0000
     3.2 +++ b/README.CD	Sat Aug 28 15:59:24 2004 +0000
     3.3 @@ -1,15 +1,15 @@
     3.4 -#############################
     3.5 - __  __            _   _____ 
     3.6 - \ \/ /___ _ __   / | |___ / 
     3.7 -  \  // _ \ '_ \  | |   |_ \ 
     3.8 -  /  \  __/ | | | | |_ ___) |
     3.9 - /_/\_\___|_| |_| |_(_)____/ 
    3.10 -                                              
    3.11 -#############################
    3.12 +###############################
    3.13 +__  __            ____    ___
    3.14 +\ \/ /___ _ __   |___ \  / _ \
    3.15 + \  // _ \ '_ \    __) || | | |
    3.16 + /  \  __/ | | |  / __/ | |_| |
    3.17 +/_/\_\___|_| |_| |_____(_)___/
    3.18  
    3.19 - XenDemoCD 1.3
    3.20 +###############################
    3.21 +
    3.22 + XenDemoCD 2.0
    3.23   University of Cambridge Computer Laboratory
    3.24 - 24 Jan 2004
    3.25 + 28 Aug 2004
    3.26  
    3.27   http://www.cl.cam.ac.uk/netos/xen
    3.28  
    3.29 @@ -18,10 +18,10 @@ Welcome to the Xen Demo CD!
    3.30  Executive Summary
    3.31  =================
    3.32  
    3.33 -This CD is a standalone demo of the Xen Virtual Machine Monitor (VMM)
    3.34 -and Linux-2.4 OS port (Xenlinux). It runs entirely off the CD,
    3.35 -without requiring hard disk installation. This is achieved using a RAM
    3.36 -disk to store mutable file system data while using the CD for
    3.37 +This CD is a standalone demo of the Xen Virtual Machine Monitor (VMM),
    3.38 + Linux-2.4 and Linux-2.6 OS port (Xenlinux). It runs entirely off the
    3.39 +CD, without requiring hard disk installation. This is achieved using a
    3.40 +RAM disk to store mutable file system data while using the CD for
    3.41  everything else. The CD can also be used for installing Xen/Xenlinux
    3.42  to disk, and includes a source code snapshot along with all of the
    3.43  tools required to build it.
    3.44 @@ -51,9 +51,9 @@ To try out the Demo, boot from CD (you m
    3.45  configuration to do this), then select one of the four boot options 
    3.46  from the Grub menu:
    3.47  
    3.48 - Xen / linux-2.4.26
    3.49 - Xen / linux-2.4.26 using cmdline IP configuration
    3.50 - Xen / linux-2.4.26 in "safe mode"
    3.51 + Xen / linux-2.4.27
    3.52 + Xen / linux-2.4.27 using cmdline IP configuration
    3.53 + Xen / linux-2.4.27 in "safe mode"
    3.54   linux-2.4.22
    3.55  
    3.56  The last option is a plain linux kernel that runs on the bare machine,
    3.57 @@ -119,7 +119,7 @@ work with Xen, and you'll only be able t
    3.58  server. We're working on a fix for this for the next release.
    3.59  
    3.60  If you want to browse the Xen / Xenlinux source, it's all located
    3.61 -under /usr/local/src/xeno-1.3, complete with BitKeeper
    3.62 +under /usr/local/src/xen-2.0.bk, complete with BitKeeper
    3.63  repository. We've also included source code and configuration
    3.64  information for the various benchmarks we used in the SOSP paper.
    3.65  
    3.66 @@ -149,7 +149,7 @@ high-level management tools will be deve
    3.67  the source repository the tools live in tools/examples/ but are
    3.68  installed in /usr/local/bin/ on the CD.
    3.69  
    3.70 -Starting a new domain is achieved using xc_dom_create.py which
    3.71 +Starting a new domain is achieved using the command 'xm create' which
    3.72  allocates resources to a new domain, populates it with a kernel image
    3.73  (and optionally a ramdisk) and then starts it.
    3.74  
    3.75 @@ -177,17 +177,13 @@ The 'mem' variable can be used to change
    3.76  of 64MB. For example to start a domain with two IP addresses and
    3.77  72MB:
    3.78  
    3.79 -  xc_dom_create.py -Dip=128.23.45.34,169.254.1.1 -Dmem=72
    3.80 +  xm create ip=128.23.45.34,169.254.1.1mem=72
    3.81  
    3.82 -[multiple variables may also be set with a single '-D' flag by
    3.83 -separating them with ':'. Also, it's possible to use DNS hostnames
    3.84 -rather than IP addresses.]
    3.85 -
    3.86 -When invoked with the '-n' option xc_dom_create.py will do a dry run
    3.87 +When invoked with the '-n' option 'xm create' will do a dry run
    3.88  and just print out what resources and configuration the domain will
    3.89  have e.g.:
    3.90  
    3.91 -  [root@xendemo]# xc_dom_create.py -D ip=commando-1.xeno,169.254.2.3 -Dmem=100
    3.92 +  [root@xendemo]# xm create -n ip=commando-1.xeno,169.254.2.3 mem=100
    3.93    Parsing config file 'defaults'
    3.94  
    3.95    VM image           : "/boot/xenlinux.gz"
    3.96 @@ -197,15 +193,15 @@ have e.g.:
    3.97    VM block device(s) : "phy:cdrom,hdd,r"
    3.98    VM cmdline         : "ip=128.232.38.51:169.254.1.0:128.232.32.1:255.255.240.0::eth0:off root=/dev/ram0 rw init=/linuxrc 4 LOCALIP=169.254.2.3"
    3.99  
   3.100 -xc_dom_create.py will print the local TCP port to which you should
   3.101 +xm create will print the local TCP port to which you should
   3.102  connect to perform console I/O. A suitable console client is provided
   3.103  by the Python module xenctl.console_client: running this module from
   3.104  the command line with <host> and <port> parameters will start a
   3.105  terminal session. This module is also installed as /usr/bin/xencons,
   3.106  from a copy in tools/misc/xencons.  An alternative to manually running
   3.107 -a terminal client is to specify '-c' to xc_dom_create.py, or add
   3.108 +a terminal client is to specify '-c' to xm create, or add
   3.109  'auto_console=True' to the defaults file. This will cause
   3.110 -xc_dom_create.py to automatically become the console terminal after
   3.111 +'xm create' to automatically become the console terminal after
   3.112  starting the domain.
   3.113  
   3.114  The 169.254.x.x network is special in that it is the 'link local'
   3.115 @@ -239,17 +235,18 @@ To access the new virtual machine remote
   3.116  
   3.117   ssh -p2201 root@IP.address.Of.Domain0  # use 2202 for domain 2 etc.
   3.118  
   3.119 -You can manipulate running domains using the xc_dom_control.py tool.
   3.120 +You can manipulate running domains using the xm tool.
   3.121  Invoking it without arguments prints some usage information.
   3.122  
   3.123 -To see what domains are running, run 'xc_dom_control.py list'.  Using the
   3.124 +To see what domains are running, run 'xm list'.  Using the
   3.125  tool you can change scheduling parameters, pause a domain, send it a
   3.126  shutdown request, or blow it away with the 'destroy' command. You can
   3.127  even suspend it to disk (but you probably won't have enough memory to
   3.128  do the latter if you're running off the demo CD).
   3.129  
   3.130 -To find usage information for xc_dom_control.py, run the script with
   3.131 -no arguments.
   3.132 +To find usage information for xm, run the script with no arguments or
   3.133 +with the 'help' argument.  To get help on a particular xm command, use
   3.134 +'xm cmdname help'.
   3.135  
   3.136  
   3.137  Troubleshooting Problems
   3.138 @@ -352,7 +349,7 @@ essentially involves copying the content
   3.139  formated disk partition, and then installing or updating the Grub
   3.140  bootloader.
   3.141  
   3.142 -This is a bootable CD that loads Xen, and then a Linux 2.4.22 OS image
   3.143 +This is a bootable CD that loads Xen, and then a Linux 2.4.27 OS image
   3.144  ported to run on Xen. The CD contains a copy of a file system based on
   3.145  the RedHat 9 distribution that is able to run directly off the CD
   3.146  ("live ISO"), using a "tmpfs" RAM-based file system for root (/etc
   3.147 @@ -400,9 +397,9 @@ config file.
   3.148  
   3.149  A typical Grub menu option might look like:
   3.150  
   3.151 -title Xen / Xenlinux 2.4.26
   3.152 +title Xen 2.0 / Xenlinux 2.4.27
   3.153          kernel /boot/xen.gz dom0_mem=131072 com1=115200 noht watchdog
   3.154 -        module /boot/vmlinuz-2.4.26-xen0 root=/dev/sda4 ro
   3.155 +        module /boot/vmlinuz-2.4.27-xen0 root=/dev/sda4 ro
   3.156  
   3.157  The first line specifies which Xen image to use, and what command line
   3.158  arguments to pass to Xen. In this case we set the maximum amount of
   3.159 @@ -421,7 +418,7 @@ require a second "module" line.
   3.160  Installing the Xen tools and source
   3.161  ===================================
   3.162  
   3.163 -The tools and source live in the /usr/local/src/xen-2.0 directory on
   3.164 +The tools and source live in the /usr/local/src/xen-2.0.bk directory on
   3.165  the CD (and may also be downloaded from the project downloads
   3.166  page). You'll need to copy them to some mutable storage before using
   3.167  them.
   3.168 @@ -480,9 +477,10 @@ Installing the file systems from the CD
   3.169  
   3.170  If you haven't got an existing Linux installation onto which you can
   3.171  just drop down the Xen and Xenlinux images, then the file systems on
   3.172 -the CD provide a quick way of doing an install. However, you're
   3.173 -probably better off in the long run doing a proper Redhat, Fedora,
   3.174 -Debian etc install rather than just doing the hack described below:
   3.175 +the CD provide a quick way of doing an install. However, you would be
   3.176 +better off in the long run doing a proper install of your preferred
   3.177 +distro and installing Xen onto that, rather than just doing the hack
   3.178 +described below:
   3.179  
   3.180  Choose one or two partitions, depending on whether you want a separate
   3.181  /usr or not. Make file systems on it/them e.g.: 
   3.182 @@ -529,7 +527,7 @@ figuring out what's happened.  Debug a X
   3.183  would any other Linux kernel.
   3.184  
   3.185  We supply a handy debug terminal program which you can find in
   3.186 -/usr/local/src/xen-1.0/xeno-1.0.bk/tools/misc/miniterm/
   3.187 +/usr/local/src/xen-2.0.bk/tools/misc/miniterm/
   3.188  This should be built and executed on another machine that is connected
   3.189  via a null modem cable. Documentation is included.
   3.190  Alternatively, if the Xen machine is connected to a serial-port server
     4.1 --- a/docs/HOWTOs/Console-HOWTO	Sat Aug 28 09:23:15 2004 +0000
     4.2 +++ b/docs/HOWTOs/Console-HOWTO	Sat Aug 28 15:59:24 2004 +0000
     4.3 @@ -1,10 +1,10 @@
     4.4 -    New console I/O infrastructure in Xen 1.3
     4.5 +    New console I/O infrastructure in Xen 2.0
     4.6      =========================================
     4.7  
     4.8      Keir Fraser, University of Cambridge, 3rd June 2004
     4.9  
    4.10   I thought I'd write a quick note about using the new console I/O
    4.11 - infrastructure in Xen 1.3. Significant new features compared with 1.2,
    4.12 + infrastructure in Xen 2.0. Significant new features compared with 1.2,
    4.13   and with older revisions of 1.3, include:
    4.14    - bi-directional console access
    4.15    - log in to a Xenolinux guest OS via its virtual console
    4.16 @@ -80,6 +80,6 @@ Virtual console for other domains
    4.17    # xencons localhost 9600
    4.18  
    4.19   An alternative to manually running a terminal client is to specify
    4.20 - '-c' to xc_dom_create.py, or add 'auto_console=True' to the defaults
    4.21 - file. This will cause xc_dom_create.py to automatically become the
    4.22 + '-c' to xm create, or add 'auto_console=True' to the defaults
    4.23 + file. This will cause xm create to automatically become the
    4.24   console terminal after starting the domain.
     5.1 --- a/docs/interface.tex	Sat Aug 28 09:23:15 2004 +0000
     5.2 +++ b/docs/interface.tex	Sat Aug 28 15:59:24 2004 +0000
     5.3 @@ -15,7 +15,7 @@
     5.4  \vfill
     5.5  \begin{tabular}{l}
     5.6  {\Huge \bf Interface manual} \\[4mm]
     5.7 -{\huge Xen v1.3 for x86} \\[80mm]
     5.8 +{\huge Xen v2.0 for x86} \\[80mm]
     5.9  
    5.10  {\Large Xen is Copyright (c) 2004, The Xen Team} \\[3mm]
    5.11  {\Large University of Cambridge, UK} \\[20mm]
     6.1 --- a/docs/user.tex	Sat Aug 28 09:23:15 2004 +0000
     6.2 +++ b/docs/user.tex	Sat Aug 28 15:59:24 2004 +0000
     6.3 @@ -77,7 +77,7 @@ following OSs have either been ported al
     6.4  progress:
     6.5  \begin{itemize}
     6.6  \item Dragonfly BSD
     6.7 -\item FreeBSD 4.8
     6.8 +\item FreeBSD 5.3
     6.9  \item Linux 2.4
    6.10  \item Linux 2.6
    6.11  \item NetBSD 2.0
    6.12 @@ -85,8 +85,8 @@ progress:
    6.13  \item Windows XP
    6.14  \end{itemize}
    6.15  
    6.16 -Right now, Linux 2.4 and 2.6 are available for on Xen 2.0.  NetBSD
    6.17 -port will be updated to run on Xen 2.0, hopefully in time for the Xen
    6.18 +Right now, Linux 2.4 and 2.6 are available for Xen 2.0.  NetBSD
    6.19 +port will be updated to run on Xen 2.0, hopefully in time for the NetBSD
    6.20  2.0 release.  It is intended that Xen support be integrated into the
    6.21  official releases of Linux 2.6, NetBSD 2.0, FreeBSD and Dragonfly BSD.
    6.22  
    6.23 @@ -289,16 +289,16 @@ line.
    6.24  \subsection{Using Bitkeeper}
    6.25  
    6.26  The public master BK repository for the 2.0 release lives at: \\
    6.27 -{\tt bk://xen.bkbits.net/xeno-unstable.bk}.  You can use Bitkeeper to
    6.28 +{\tt bk://xen.bkbits.net/xen-2.0.bk}.  You can use Bitkeeper to
    6.29  download it and keep it updated with the latest features and fixes.
    6.30  
    6.31  Change to the directory in which you want to put the source code, then
    6.32  run:
    6.33  \begin{verbatim}
    6.34 -# bk clone bk://xen.bkbits.net/xeno-unstable.bk
    6.35 +# bk clone bk://xen.bkbits.net/xeno-2.0.bk
    6.36  \end{verbatim}
    6.37  
    6.38 -Under your current directory, a new directory named 'xeno-unstable.bk'
    6.39 +Under your current directory, a new directory named `xeno-2.0.bk'
    6.40  has been created, which contains all the source code for the Xen
    6.41  hypervisor and the Xen tools.  The directory also contains `sparse'
    6.42  Linux source trees, containing only the files that differ between
    6.43 @@ -307,8 +307,8 @@ XenLinux and standard Linux.
    6.44  Once you have cloned the repository, you can update to the newest
    6.45  changes to the repository by running:
    6.46  \begin{verbatim}
    6.47 -# cd xeno-unstable.bk # to change into the local repository
    6.48 -# bk pull             # to update the repository
    6.49 +# cd xeno-2.0.bk # to change into the local repository
    6.50 +# bk pull        # to update the repository
    6.51  \end{verbatim}
    6.52  
    6.53  \subsection{Without Bitkeeper}
    6.54 @@ -494,18 +494,22 @@ require a more complex setup, you will w
    6.55  configuration file --- details of the configuration file formats are
    6.56  included in Chapter~\ref{cha:config}.
    6.57  
    6.58 -The \path{xmdefaults} file is a template description that is intended
    6.59 -to be reused for multiple virtual machines.  Setting the value of the
    6.60 -{\tt vmid} variable fills in parts of this template.
    6.61 +The \path{xmdefconfig1} file is a simple template configuration file
    6.62 +for describing a single VM.
    6.63  
    6.64 -\subsection{Editing \path{xmdefaults}}
    6.65 +The \path{xmdefconfig2} file is a template description that is intended
    6.66 +to be reused for multiple virtual machines.  Setting the value of the
    6.67 +{\tt vmid} variable on the {\tt xm} command line
    6.68 +fills in parts of this template.
    6.69  
    6.70 -At minimum, you should edit the following variables in \path{xmdefaults}:
    6.71 +\subsection{Editing \path{xmdefconfig}}
    6.72 +
    6.73 +At minimum, you should edit the following variables in \path{xmdefconfig}:
    6.74  
    6.75  \begin{description}
    6.76  \item[kernel] Set this to the path of the kernel you compiled for use
    6.77                with Xen. [e.g. {\tt kernel =
    6.78 -              '/root/xeno-unstable.bk/install/boot/vmlinuz-2.4.27-xenU'}]
    6.79 +              '/root/xeno-2.0.bk/install/boot/vmlinuz-2.4.27-xenU'}]
    6.80  \item[memory] Set this to the size of the domain's memory in
    6.81  megabytes. [e.g. {\tt memory = 64 } ]
    6.82  \item[disk] Set the first entry in this list to calculate the offset
    6.83 @@ -535,8 +539,8 @@ virtual machine with virtual machine ID 
    6.84  
    6.85  The {\tt -c} switch causes {\tt xm} to turn into the domain's console
    6.86  after creation.  The {\tt vmid=1} sets the {\tt vmid} variable used in
    6.87 -the {\tt xmdefaults} file.  The tool uses the
    6.88 -\path{/etc/xen/xmdefaults} file, since no custom configuration file
    6.89 +the {\tt xmdefconfig} file.  The tool uses the
    6.90 +\path{/etc/xen/xmdefconfig} file, since no custom configuration file
    6.91  was specified on the command line.
    6.92  
    6.93  \chapter{Domain management tasks}
    6.94 @@ -678,7 +682,7 @@ Xen configuration files contain the foll
    6.95  \end{description}
    6.96  
    6.97  It is also possible to include Python scripting commands in
    6.98 -configuration files.  This is done in the \path{xmdefaults} file in
    6.99 +configuration files.  This is done in the \path{xmdefconfig} file in
   6.100  order to handle the {\tt vmid} variable.
   6.101  
   6.102  
   6.103 @@ -743,7 +747,7 @@ The available {\em switches } and {\em a
   6.104  declarations of the form {\tt variable=value} and may be used to set /
   6.105  override any of the values in the configuration file being used,
   6.106  including the standard variables described above and any custom
   6.107 -variables (for instance, the \path{xmdefaults} file uses a {\tt vmid}
   6.108 +variables (for instance, the \path{xmdefconfig} file uses a {\tt vmid}
   6.109  variable).
   6.110  
   6.111  The available commands are as follows:
   6.112 @@ -1021,7 +1025,7 @@ IO privileges can be assigned to allow a
   6.113  itself.  This is used for to support driver domains.
   6.114  
   6.115  Setting backend privileges is currently only supported in SXP format
   6.116 -config files (??? is this true - there's nothing in xmdefaults,
   6.117 +config files (??? is this true - there's nothing in xmdefconfig,
   6.118  anyhow).  To allow a domain to function as a backend for others,
   6.119  somewhere within the {\tt vm} element of its configuration file must
   6.120  be a {\tt backend} element of the form {\tt (backend ({\em type}))}
     7.1 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S	Sat Aug 28 09:23:15 2004 +0000
     7.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/head.S	Sat Aug 28 15:59:24 2004 +0000
     7.3 @@ -1,6 +1,6 @@
     7.4  
     7.5  .section __xen_guest
     7.6 -    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=1.3,VIRT_BASE=0xC0000000"
     7.7 +    .asciz "GUEST_OS=linux,GUEST_VER=2.4,XEN_VER=2.0,VIRT_BASE=0xC0000000"
     7.8  
     7.9  .text
    7.10  #include <linux/config.h>
     8.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S	Sat Aug 28 09:23:15 2004 +0000
     8.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S	Sat Aug 28 15:59:24 2004 +0000
     8.3 @@ -1,6 +1,6 @@
     8.4  
     8.5  .section __xen_guest
     8.6 -	.asciz "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=1.3"
     8.7 +	.asciz "GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0"
     8.8  
     8.9  .text
    8.10  #include <linux/config.h>
     9.1 --- a/tools/libxc/xc_linux_build.c	Sat Aug 28 09:23:15 2004 +0000
     9.2 +++ b/tools/libxc/xc_linux_build.c	Sat Aug 28 15:59:24 2004 +0000
     9.3 @@ -601,9 +601,9 @@ static int parseelfimage(char *elfbase,
     9.4          guestinfo = elfbase + shdr->sh_offset;
     9.5  
     9.6          if ( (strstr(guestinfo, "GUEST_OS=linux") == NULL) ||
     9.7 -             (strstr(guestinfo, "XEN_VER=1.3") == NULL) )
     9.8 +             (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
     9.9          {
    9.10 -            ERROR("Will only load Linux images built for Xen v1.3");
    9.11 +            ERROR("Will only load Linux images built for Xen v2.0");
    9.12              ERROR("Actually saw: '%s'", guestinfo);
    9.13              return -EINVAL;
    9.14          }
    10.1 --- a/xen/Makefile	Sat Aug 28 09:23:15 2004 +0000
    10.2 +++ b/xen/Makefile	Sat Aug 28 15:59:24 2004 +0000
    10.3 @@ -1,9 +1,9 @@
    10.4  
    10.5  # This is the correct place to edit the build version.
    10.6  # All other places this is stored (eg. compile.h) should be autogenerated.
    10.7 -export XEN_VERSION       = 1
    10.8 -export XEN_SUBVERSION    = 3
    10.9 -export XEN_EXTRAVERSION  = "-devel"
   10.10 +export XEN_VERSION       = 2
   10.11 +export XEN_SUBVERSION    = 0
   10.12 +export XEN_EXTRAVERSION  = "-beta"
   10.13  
   10.14  export BASEDIR          := $(shell pwd)
   10.15  
    11.1 --- a/xen/common/elf.c	Sat Aug 28 09:23:15 2004 +0000
    11.2 +++ b/xen/common/elf.c	Sat Aug 28 15:59:24 2004 +0000
    11.3 @@ -69,9 +69,9 @@ int parseelfimage(char *elfbase,
    11.4          printk("Xen-ELF header found: '%s'\n", guestinfo);
    11.5  
    11.6          if ( (strstr(guestinfo, "GUEST_OS=linux") == NULL) ||
    11.7 -             (strstr(guestinfo, "XEN_VER=1.3") == NULL) )
    11.8 +             (strstr(guestinfo, "XEN_VER=2.0") == NULL) )
    11.9          {
   11.10 -            printk("ERROR: Xen will only load Linux built for Xen v1.3\n");
   11.11 +            printk("ERROR: Xen will only load Linux built for Xen v2.0\n");
   11.12              return -EINVAL;
   11.13          }
   11.14