bitkeeper revision 1.824 (40601cf9uRnKyyagj6umr4Oaf_-gWQ)

Many files:
  xeno -> xen renames.
xen_proc.c:
  Rename: xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c -> xenolinux-2.4.25-sparse/arch/xen/lib/xen_proc.c
xen_proc.h:
  Rename: xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h -> xenolinux-2.4.25-sparse/include/asm-xen/xen_proc.h
Xen-HOWTO.txt:
  Rename: docs/Xeno-HOWTO.txt -> docs/Xen-HOWTO.txt

.rootkeys

@@ -9,7 +9,7 @@
 405ef604hIZH5pGi2uwlrlSvUMrutw docs/Console-HOWTO.txt
 3f9e7d53iC47UnlfORp9iC1vai6kWw docs/Makefile
 40083bb4LVQzRqA3ABz0__pPhGNwtA docs/VBD-HOWTO.txt
-4021053fmeFrEyPHcT8JFiDpLNgtHQ docs/Xeno-HOWTO.txt
+4021053fmeFrEyPHcT8JFiDpLNgtHQ docs/Xen-HOWTO.txt
 3f9e7d60PWZJeVh5xdnk0nLUdxlqEA docs/eps/xenlogo.eps
 3f9e7d63lTwQbp2fnx7yY93epWS-eQ docs/figs/dummy
 3f9e7d564bWFB-Czjv1qdmE6o0GqNg docs/interface.tex
@@ -647,7 +647,7 @@
 3e5a4e66aHCbQ_F5QZ8VeyikLmuRZQ xenolinux-2.4.25-sparse/arch/xen/kernel/traps.c
 3e5a4e66-9_NczrVMbuQkoSLyXckIw xenolinux-2.4.25-sparse/arch/xen/lib/Makefile
 3e5a4e6637ZDk0BvFEC-aFQs599-ng xenolinux-2.4.25-sparse/arch/xen/lib/delay.c
-3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.25-sparse/arch/xen/lib/xeno_proc.c
+3f68905cF5i8-NYpIhGjKmh0y8Gu5g xenolinux-2.4.25-sparse/arch/xen/lib/xen_proc.c
 3e5a4e66croVgpcJyJuF2ycQw0HuJw xenolinux-2.4.25-sparse/arch/xen/mm/Makefile
 3e5a4e66l8Q5Tv-6B3lQIRmaVbFPzg xenolinux-2.4.25-sparse/arch/xen/mm/fault.c
 3e5a4e668SE9rixq4ahho9rNhLUUFQ xenolinux-2.4.25-sparse/arch/xen/mm/hypervisor.c
@@ -684,7 +684,7 @@
 3fa8e3f0kBLeE4To2vpdi3cpJbIkbQ xenolinux-2.4.25-sparse/include/asm-xen/suspend.h
 3e5a4e68mTr0zcp9SXDbnd-XLrrfxw xenolinux-2.4.25-sparse/include/asm-xen/system.h
 3f1056a9L_kqHcFheV00KbKBzv9j5w xenolinux-2.4.25-sparse/include/asm-xen/vga.h
-3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.25-sparse/include/asm-xen/xeno_proc.h
+3f689063nhrIRsMMZjZxMFk7iEINqQ xenolinux-2.4.25-sparse/include/asm-xen/xen_proc.h
 3f056927gMHl7mWB89rb73JahbhQIA xenolinux-2.4.25-sparse/include/linux/blk.h
 3e5a4e68WLX3B8owTvktP3HHOtznPQ xenolinux-2.4.25-sparse/include/linux/major.h
 401c0590D_kwJDU59X8NyvqSv_Cl2A xenolinux-2.4.25-sparse/include/linux/sched.h

Makefile

@@ -5,9 +5,9 @@
 #  cd xenolinux-<version>-sparse
 #  ./mkbuildtree <build dir>
 #  cd <build dir>
-#  ARCH=xeno make oldconfig
-#  ARCH=xeno make dep
-#  ARCH=xeno make bzImage
+#  ARCH=xen make oldconfig
+#  ARCH=xen make dep
+#  ARCH=xen make bzImage
 #  (<build dir> should be a vanilla linux tree with matching version)
 
 all:	

README

@@ -62,8 +62,7 @@ regularly use it to host complex applications such as PostgreSQL,
 Apache, BK servers etc. It runs every user-space applications we've
 tried.  We refer to our version of Linux ported to run on Xen as
 "XenoLinux", although really it's just standard Linux ported to a new
-virtual CPU architecture that we call xeno-x86 (abbreviated to just
-"xeno").
+virtual CPU architecture that we call xen-x86.
 
 NetBSD has been ported to Xen by Christian Limpach, and will hopefully
 soon become part of the standard release. Work on a FreeBSD port has
@@ -147,7 +146,7 @@ can be used to clone the repository and perform a full build.
 
 The build procedure for xenolinux is slightly complicated as its done
 by running the 'mkbuildtree' script over a pristine Linux tree to turn
-it into a xenolinux tree by adding the 'xeno' architecture.
+it into a xenolinux tree by adding the 'xen' architecture.
 
 There's also a recent pre-built source tree on the project downloads
 page: http://www.cl.cam.ac.uk/netos/xen/downloads/xeno-1.2.tar.gz
@@ -160,6 +159,6 @@ README.CD contains some example invocations.
 
 See example Python scripts in tools/examples/ and the associated README.
 
-Further documentation is in docs/ (e.g., docs/Xeno-HOWTO), and also in
+Further documentation is in docs/ (e.g., docs/Xen-HOWTO), and also in
 
 

README.CD

@@ -577,7 +577,7 @@ like normal linux kernels. Modules should be installed under
 If there's some kernel feature that hasn't been built into our default
 kernel, there's a pretty good change that if its a non-hardware
 related option you'll just be able to enable it and rebuild.  If its
-not on the xconfig menu, hack the arch/xeno/config.in to put the menu
+not on the xconfig menu, hack the arch/xen/config.in to put the menu
 back in.
 
 If you're going to use the link local 169.254.1.x addresses to

docs/Makefile

@@ -21,7 +21,7 @@ clean:
 
 install: $(DOCUMENTS)
 	mkdir -p $(prefix)/usr/share/doc/xen
-	cp -a $(DOCUMENTS) VBD-HOWTO.txt Xeno-1.2-HOWTO.txt $(prefix)/usr/share/doc/xen
+	cp -a $(DOCUMENTS) VBD-HOWTO.txt Xen-HOWTO.txt $(prefix)/usr/share/doc/xen
 
 %.pdf: %.ps
 	ps2pdf $< $@

docs/Xen-HOWTO.txt

@@ -1,5 +1,5 @@
 ###########################################
-Xeno HOWTO
+Xen HOWTO
 
 University of Cambridge Computer Laboratory
 
@@ -7,8 +7,8 @@ http://www.cl.cam.ac.uk/netos/xen
 #############################
 
 
-Get Xeno Source Codes
-==========================
+Get Xen Source Code
+=============================
 
 The public master BK repository for the 1.2 release lives at:
 'bk://xen.bkbits.net/xeno-1.2.bk'
@@ -21,8 +21,8 @@ Then install the tools and then run:
 # bk clone bk://xen.bkbits.net/xeno-1.2.bk
 
 Under your current directory, a new directory named 'xeno-1.2.bk' has
-been created, which contains all the source codes for Xen and
-XenoLinux. 
+been created, which contains all the necessary source codes for the
+Xen hypervisor and Linux guest OSes.
 
 To get newest changes to the repository, run
 # cd xeno-1.2.bk
@@ -46,7 +46,7 @@ This will (should) produce a file called 'xen' in the current
 directory.  This is the ELF 32-bit LSB executable file of Xen.  You
 can also find a gzip version, named 'xen.gz'.
 
-To install the built files on your Xenoserver under /usr, type 'make
+To install the built files on your server under /usr, type 'make
 install' at the root of the BK repository. You will need to be root to
 do this!
 
@@ -55,14 +55,14 @@ install directory just outside the BK repo; if this suits your setup,
 go for it.
 
 
-Build XenoLinux
+Build Linux as a Xen guest OS
 ==============================
 
 This is a little more involved since the repository only contains a
 "sparse" tree -- this is essentially an 'overlay' on a standard linux
 kernel source tree. It contains only those files currently 'in play'
 which are either modified versions of files in the vanilla linux tree,
-or brand new files specific to XenoLinux.
+or brand new files specific to the Xen port.
 
 So, first you need a vanilla linux-2.4.24 tree, which is located at:
 http://www.kernel.org/pub/linux/kernel/v2.4
@@ -84,7 +84,7 @@ kernel tree:
   # cd /xeno-1.2.bk/xenolinux-2.4.24-sparse
   # ./mkbuildtree ../linux-2.4.24
 
-Finally, rename the buildtree since it is now a xenolinux buildtree. 
+Finally, rename the buildtree since it is now a 'xenolinux' buildtree. 
 
   # cd /xeno-1.2.bk
   # mv linux-2.4.24 xenolinux-2.4.24
@@ -95,12 +95,12 @@ oldconfig') but you can customise using one of the other config tools
 if you want.
 
   # cd /xeno-1.2.bk/xenolinux-2.4.24
-  # ARCH=xeno make oldconfig   { or menuconfig, or xconfig, or config }  
-  # ARCH=xeno make dep
-  # ARCH=xeno make bzImage
+  # ARCH=xen make oldconfig   { or menuconfig, or xconfig, or config }  
+  # ARCH=xen make dep
+  # ARCH=xen make bzImage
 
 Assuming the build works, you'll end up with
-/xeno-1.2.bk/xenolinux-2.4.24/arch/xeno/boot/xenolinux.gz. This is the
+/xeno-1.2.bk/xenolinux-2.4.24/arch/xen/boot/xenolinux.gz. This is the
 gzip version of XenoLinux kernel image.
 
 
@@ -123,7 +123,7 @@ libraries in /usr/bin and /usr/lib. You will need to be root to do this!
 
 As noted earlier, 'make dist' installs files to a local 'install'
 directory just outside the BK repository. These files will then need
-to be installed manually onto the Xenoserver.
+to be installed manually onto the server.
 
 The Example Scripts
 ===================
@@ -149,7 +149,7 @@ Installation
 
 First:
 # cp /xen-1.2.bk/xen/xen.gz /boot/xen.gz
-# cp /xen-1.2.bk/xenolinux-2.4.24/arch/xeno/boot/xenolinux.gz /boot/xenolinux.gz
+# cp /xen-1.2.bk/xenolinux-2.4.24/arch/xen/boot/xenolinux.gz /boot/xenolinux.gz
 
 Second, you must have 'GNU Grub' installed. Then you need to edit
 the Grub configuration file '/boot/grub/menu.lst'.

docs/interface.tex

@@ -705,7 +705,7 @@ behaviours.
 \subsection{Internal API}
 
 To use the trace buffer functionality from within Xen, you must {\tt \#include
-<xeno/trace.h>}, which contains definitions related to the trace buffer.  Trace
+<xen/trace.h>}, which contains definitions related to the trace buffer.  Trace
 events are inserted into the buffer using the {\tt TRACE\_xD} ({\tt x} = 0, 1,
 2, 3, 4 or 5) macros.  These all take an event number, plus {\tt x} additional
 (32-bit) data as their arguments.  For trace buffer-enabled builds of Xen these
@@ -718,7 +718,7 @@ overheads.
 
 By default, the trace buffer is enabled only in debug builds (i.e. {\tt NDEBUG}
 is not defined).  It can be enabled separately by defining {\tt TRACE\_BUFFER},
-either in {\tt <xeno/config.h>} or on the gcc command line.
+either in {\tt <xen/config.h>} or on the gcc command line.
 
 \subsection{Dumping trace data}
 

docs/pdb.txt

@@ -57,8 +57,8 @@ Xen Configuration
   Symbolic debugging infomration is quite helpful too:
   xeno.bk/xen/arch/i386/Rules.mk
     add -g to CFLAGS to compile Xen with symbols
-  xeno.bk/xenolinux-2.4.24-sparse/arch/xeno/Makefile
-    add -g to CFLAGS to compile XenoLinux with symbols
+  xeno.bk/xenolinux-2.4.24-sparse/arch/xen/Makefile
+    add -g to CFLAGS to compile Linux with symbols
 
   You may also want to consider dedicating a register to the
   frame pointer (disable the -fomit-frame-pointer compile flag).
@@ -97,7 +97,7 @@ GDB 6.0
 Usage
 -----
 
-1. Boot Xen and XenoLinux
+1. Boot Xen and Linux
 2. Interrupt Xen by pressing 'D' at the console
    You should see the console message: 
    pdb_handle_exception [0x88][0xfc5c9d88]

extras/mini-os/h/types.h

@@ -9,7 +9,7 @@
  *              
  *        Date: May 2003
  * 
- * Environment: Xeno Minimal OS
+ * Environment: Xen Minimal OS
  * Description: a random collection of type definitions
  *
  ****************************************************************************

extras/mini-os/kernel.c

@@ -96,7 +96,7 @@ void start_kernel(start_info_t *si)
     __sti();
     
     /* print out some useful information  */
-    printk("Xeno Minimal OS!\n");
+    printk("Xen Minimal OS!\n");
     printk("start_info:   %p\n",  si);
     printk("  nr_pages:   %lu",     si->nr_pages);
     printk("  shared_inf: %08lx\n", si->shared_info);

tools/misc/xen-clone

@@ -86,11 +86,11 @@ cd ../..
 mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
 cd xenolinux-${LINUX_VER}
 
-ARCH=xeno make oldconfig
-ARCH=xeno make dep
-ARCH=xeno make bzImage
-ARCH=xeno make dist || ARCH=xeno make install
-ARCH=xeno make modules
-ARCH=xeno make INSTALL_MOD_PATH=${TOP}/install modules_install
+ARCH=xen make oldconfig
+ARCH=xen make dep
+ARCH=xen make bzImage
+ARCH=xen make dist || ARCH=xen make install
+ARCH=xen make modules
+ARCH=xen make INSTALL_MOD_PATH=${TOP}/install modules_install
 cd ..
 

tools/xc/lib/xc_linux_restore.c

@@ -1,13 +1,13 @@
 /******************************************************************************
  * xc_linux_restore.c
  * 
- * Restore the state of a Xenolinux session.
+ * Restore the state of a Linux session.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
 #include "xc_private.h"
-#include <asm-xeno/suspend.h>
+#include <asm-xen/suspend.h>
 #include <zlib.h>
 
 /* This may allow us to create a 'quiet' command-line option, if necessary. */

tools/xc/lib/xc_linux_save.c

@@ -1,13 +1,13 @@
 /******************************************************************************
  * xc_linux_save.c
  * 
- * Save the state of a running Xenolinux session.
+ * Save the state of a running Linux session.
  * 
  * Copyright (c) 2003, K A Fraser.
  */
 
 #include "xc_private.h"
-#include <asm-xeno/suspend.h>
+#include <asm-xen/suspend.h>
 #include <zlib.h>
 
 /* This may allow us to create a 'quiet' command-line option, if necessary. */

tools/xc/lib/xc_private.h

@@ -16,7 +16,7 @@
 
 #include "xc.h"
 
-#include <asm-xeno/proc_cmd.h>
+#include <asm-xen/proc_cmd.h>
 
 /* from xen/include/hypervisor-ifs */
 #include <hypervisor-if.h>

xenolinux-2.4.25-sparse/Makefile

@@ -10,7 +10,12 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 # This will be overriden for Xen and UML builds.
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 ARCH ?= $(SUBARCH)
-ARCH := $(ARCH:xeno=xen) ## Temporary hack while users adjust to new archname
+
+## XXX The following hack can be discarded after users have adjusted to the
+## architectural name change 'xeno' -> 'xen'.
+ifeq ($(ARCH),xeno)
+  ARCH := xen
+endif
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 

xenolinux-2.4.25-sparse/arch/xen/drivers/console/console.c

@@ -87,8 +87,8 @@ static void priv_conwrite(const char *s, unsigned int count)
     }
 }
 
-static void xen_console_write(struct console *co, const char *s, 
-                              unsigned int count)
+static void kcons_write(struct console *co, const char *s, 
+                        unsigned int count)
 {
     unsigned long flags;
     spin_lock_irqsave(&xen_console_lock, flags);
@@ -99,7 +99,7 @@ static void xen_console_write(struct console *co, const char *s,
     spin_unlock_irqrestore(&xen_console_lock, flags);
 }
 
-static kdev_t xen_console_device(struct console *c)
+static kdev_t kcons_device(struct console *c)
 {
     /*
      * This is the magic that binds our "struct console" to our
@@ -108,19 +108,17 @@ static kdev_t xen_console_device(struct console *c)
     return MKDEV(TTY_MAJOR, XEN_TTY_MINOR);
 }
 
-static struct console xen_console_info = {
-    name:		"xencons", /* Used to be xen_console, but we're only
-				      actually allowed 8 charcters including
-				      the terminator... */
-    write:		xen_console_write,
-    device:             xen_console_device,
-    flags:		CON_PRINTBUFFER,
-    index:		-1,
+static struct console kcons_info = {
+    name:    "xencons",
+    write:   kcons_write,
+    device:  kcons_device,
+    flags:   CON_PRINTBUFFER,
+    index:   -1,
 };
 
 void xen_console_init(void)
 {
-    register_console(&xen_console_info);
+    register_console(&kcons_info);
 }
 
 
@@ -137,7 +135,7 @@ asmlinkage int xprintk(const char *fmt, ...)
     va_end(args);
     
     /* Send the processed output directly to Xen. */
-    xen_console_write(NULL, printk_buf, printk_len);
+    kcons_write(NULL, printk_buf, printk_len);
 
     return 0;
 }