ia64/xen-unstable

changeset 5227:777fa188124b

bitkeeper revision 1.1608 (429c646erSBefwnCqVeHKzsRTMIwjA)

Merge.
author cl349@firebug.cl.cam.ac.uk
date Tue May 31 13:19:42 2005 +0000 (2005-05-31)
parents 0ecc863ef3ed fbc155c746d4
children ea32d909807d
files README docs/src/user.tex tools/vnet/doc/vnet-xend.txt xen/Makefile
line diff
     1.1 --- a/README	Tue May 31 09:32:19 2005 +0000
     1.2 +++ b/README	Tue May 31 13:19:42 2005 +0000
     1.3 @@ -50,16 +50,16 @@ 2. Configure your bootloader to boot Xen
     1.4     alternatives such as LILO are *not* supported. You can most likely
     1.5     find your GRUB menu file at /boot/grub/menu.lst: edit this file to
     1.6     include an entry like the following:
     1.7 -    # title Xen 2.0 / XenLinux 2.6.9
     1.8 -    #   kernel /boot/xen.gz dom0_mem=<mem-kb> console=vga
     1.9 -    #   module /boot/vmlinuz-2.6.9-xen0 root=<root-dev> ro console=tty0
    1.10 +    # title Xen 2.0 / XenLinux 2.6
    1.11 +    #   kernel /boot/xen-2.0.gz dom0_mem=<mem-kb> console=vga
    1.12 +    #   module /boot/vmlinuz-2.6-xen0 root=<root-dev> ro console=tty0
    1.13     For <mem-kb> you should specify the amount of memory, in kilobytes,
    1.14     to allocate for use by your initial XenLinux virtual machine. Note
    1.15     that Xen itself reserves about 32MB memory for internal use, which
    1.16     is not available for allocation to virtual machines.
    1.17     For <root-dev>, specify your usual root partition (e.g., /dev/hda1).
    1.18  
    1.19 -3. Reboot your system and select the "Xen 2.0 / XenLinux 2.6.9" menu
    1.20 +3. Reboot your system and select the "Xen 2.0 / XenLinux 2.6" menu
    1.21     option. After booting Xen, XenLinux will start and your
    1.22     initialisation scripts should execute in the usual way.
    1.23  
     2.1 --- a/docs/src/user.tex	Tue May 31 09:32:19 2005 +0000
     2.2 +++ b/docs/src/user.tex	Tue May 31 13:19:42 2005 +0000
     2.3 @@ -376,7 +376,7 @@ kernel containing only virtual device dr
     2.4  %% it will then add the Xen architecture files.  You can tell the
     2.5  %% makefile the location of the appropriate Linux compressed tar file by
     2.6  %% setting the LINUX\_SRC environment variable, e.g. \\
     2.7 -%% \verb!# LINUX_SRC=/tmp/linux-2.6.9.tar.bz2 make world! \\ or by
     2.8 +%% \verb!# LINUX_SRC=/tmp/linux-2.6.11.tar.bz2 make world! \\ or by
     2.9  %% placing the tar file somewhere in the search path of {\tt
    2.10  %% LINUX\_SRC\_PATH} which defaults to `{\tt .:..}'.  If the makefile
    2.11  %% can't find a suitable kernel tar file it attempts to download it from
    2.12 @@ -407,7 +407,7 @@ use the standard Linux configuration mec
    2.13  architecture being built for is \path{xen}, e.g:
    2.14  \begin{quote}
    2.15  \begin{verbatim} 
    2.16 -# cd linux-2.6.9-xen0 
    2.17 +# cd linux-2.6.11-xen0 
    2.18  # make ARCH=xen xconfig 
    2.19  # cd ..
    2.20  # make
    2.21 @@ -415,7 +415,7 @@ architecture being built for is \path{xe
    2.22  \end{quote} 
    2.23  
    2.24  You can also copy an existing Linux configuration (\path{.config}) 
    2.25 -into \path{linux-2.6.9-xen0} and execute:  
    2.26 +into \path{linux-2.6.11-xen0} and execute:  
    2.27  \begin{quote}
    2.28  \begin{verbatim} 
    2.29  # make ARCH=xen oldconfig 
    2.30 @@ -453,15 +453,15 @@ destinations.
    2.31  
    2.32  %% Files in \path{install/boot/} include:
    2.33  %% \begin{itemize}
    2.34 -%% \item \path{install/boot/xen.gz} The Xen 'kernel'
    2.35 -%% \item \path{install/boot/vmlinuz-2.6.9-xen0}  Domain 0 XenLinux kernel
    2.36 -%% \item \path{install/boot/vmlinuz-2.6.9-xenU}  Unprivileged XenLinux kernel
    2.37 +%% \item \path{install/boot/xen-2.0.gz} Link to the Xen 'kernel'
    2.38 +%% \item \path{install/boot/vmlinuz-2.6-xen0}  Link to domain 0 XenLinux kernel
    2.39 +%% \item \path{install/boot/vmlinuz-2.6-xenU}  Link to unprivileged XenLinux kernel
    2.40  %% \end{itemize}
    2.41  
    2.42  The \path{dist/install/boot} directory will also contain the config files
    2.43  used for building the XenLinux kernels, and also versions of Xen and
    2.44 -XenLinux kernels that contain debug symbols (\path{xen-syms} and
    2.45 -\path{vmlinux-syms-2.6.9-xen0}) which are essential for interpreting crash
    2.46 +XenLinux kernels that contain debug symbols (\path{xen-syms-2.0.6} and
    2.47 +\path{vmlinux-syms-2.6.11.11-xen0}) which are essential for interpreting crash
    2.48  dumps.  Retain these files as the developers may wish to see them if
    2.49  you post on the mailing list.
    2.50  
    2.51 @@ -483,9 +483,9 @@ distribution.  The entry should look som
    2.52  
    2.53  {\small
    2.54  \begin{verbatim}
    2.55 -title Xen 2.0 / XenLinux 2.6.11
    2.56 -  kernel /boot/xen.gz dom0_mem=131072
    2.57 -  module /boot/vmlinuz-2.6.11-xen0 root=/dev/sda4 ro console=tty0
    2.58 +title Xen 2.0 / XenLinux 2.6
    2.59 +  kernel /boot/xen-2.0.gz dom0_mem=131072
    2.60 +  module /boot/vmlinuz-2.6-xen0 root=/dev/sda4 ro console=tty0
    2.61  \end{verbatim}
    2.62  }
    2.63  
    2.64 @@ -524,8 +524,8 @@ have problems.
    2.65  
    2.66  \subsection{Serial Console (optional)}
    2.67  
    2.68 -%%   kernel /boot/xen.gz dom0_mem=131072 com1=115200,8n1
    2.69 -%%   module /boot/vmlinuz-2.6.9-xen0 root=/dev/sda4 ro 
    2.70 +%%   kernel /boot/xen-2.0.gz dom0_mem=131072 com1=115200,8n1
    2.71 +%%   module /boot/vmlinuz-2.6-xen0 root=/dev/sda4 ro 
    2.72  
    2.73  
    2.74  In order to configure Xen serial console output, it is necessary to add 
    2.75 @@ -654,7 +654,7 @@ Typical values you may wish to edit incl
    2.76  \begin{quote}
    2.77  \begin{description}
    2.78  \item[kernel] Set this to the path of the kernel you compiled for use
    2.79 -              with Xen (e.g.\  \path{kernel = '/boot/vmlinuz-2.6.9-xenU'})
    2.80 +              with Xen (e.g.\  \path{kernel = '/boot/vmlinuz-2.6-xenU'})
    2.81  \item[memory] Set this to the size of the domain's memory in
    2.82  megabytes (e.g.\ \path{memory = 64})
    2.83  \item[disk] Set the first entry in this list to calculate the offset
    2.84 @@ -717,7 +717,7 @@ section of the project's SourceForge sit
    2.85  \path{http://sf.net/projects/xen/}).
    2.86  \item Create a configuration file like the following:
    2.87  \begin{verbatim}
    2.88 -kernel = "/boot/vmlinuz-2.6.9-xenU"
    2.89 +kernel = "/boot/vmlinuz-2.6-xenU"
    2.90  memory = 64
    2.91  name = "ttylinux"
    2.92  nics = 1
     3.1 --- a/tools/vnet/doc/vnet-xend.txt	Tue May 31 09:32:19 2005 +0000
     3.2 +++ b/tools/vnet/doc/vnet-xend.txt	Tue May 31 13:19:42 2005 +0000
     3.3 @@ -102,7 +102,7 @@ Here's the full config for a vm on vnet 
     3.4   (console '8502')
     3.5   (image
     3.6    (linux
     3.7 -   (kernel /boot/vmlinuz-2.6.9-xenU)
     3.8 +   (kernel /boot/vmlinuz-2.6-xenU)
     3.9     (ip 10.0.0.12:1.2.3.4::::eth0:off)
    3.10     (root /dev/hda1)
    3.11     (args 'rw fastboot 4')
    3.12 @@ -121,7 +121,7 @@ If you run another vm on the same vnet:
    3.13   (console '8501')
    3.14   (image
    3.15    (linux
    3.16 -   (kernel /boot/vmlinuz-2.6.9-xenU)
    3.17 +   (kernel /boot/vmlinuz-2.6-xenU)
    3.18     (ip 10.0.0.11:1.2.3.4::::eth0:off)
    3.19     (root /dev/hda1)
    3.20     (args 'rw fastboot 4')
     4.1 --- a/xen/Makefile	Tue May 31 09:32:19 2005 +0000
     4.2 +++ b/xen/Makefile	Tue May 31 13:19:42 2005 +0000
     4.3 @@ -35,7 +35,7 @@ install: $(TARGET).gz
     4.4  	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz
     4.5  	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
     4.6  	ln -f -s $(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz
     4.7 -	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)-syms
     4.8 +	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
     4.9  	[ -d $(DESTDIR)/usr/include/xen/io ] || \
    4.10  		$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
    4.11  	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen