From f8abd8d851098f180d6c38931bf69d809a42bbaa Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 7 Aug 2008 09:04:53 +0100 Subject: Revert 18242:f20fb83dac2c (Xen 3.3 after all) Signed-off-by: Keir Fraser --- README | 20 ++++++++++---------- xen/Makefile | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index 65a27d5f76..1a46b32371 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# - __ __ _ _ ___ - \ \/ /___ _ __ | || | / _ \ - \ // _ \ '_ \ | || |_| | | | - / \ __/ | | | |__ _| |_| | - /_/\_\___|_| |_| |_|(_)___/ - + __ __ _____ _____ + \ \/ /___ _ __ |___ / |___ / + \ // _ \ '_ \ |_ \ |_ \ + / \ __/ | | | ___) | ___) | + /_/\_\___|_| |_| |____(_)____/ + ################################# http://www.xen.org/ @@ -21,7 +21,7 @@ development community, spearheaded by XenSource Inc, a company created by the original Xen development team to build enterprise products around Xen. -The 4.0 release offers excellent performance, hardware support and +The 3.3 release offers excellent performance, hardware support and enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and live relocation of VMs. Ports to Linux 2.6, Linux 2.4, NetBSD, FreeBSD and Solaris are available from the community. @@ -54,8 +54,8 @@ performed with root privileges.] /boot/grub/menu.lst: edit this file to include an entry like the following: - title Xen 4.0 / XenLinux 2.6 - kernel /boot/xen-4.0.gz console=vga + title Xen 3.3 / XenLinux 2.6 + kernel /boot/xen-3.3.gz console=vga module /boot/vmlinuz-2.6-xen root= ro console=tty0 module /boot/initrd-2.6-xen.img @@ -74,7 +74,7 @@ performed with root privileges.] 32MB memory for internal use, which is not available for allocation to virtual machines. -3. Reboot your system and select the "Xen 4.0 / XenLinux 2.6" menu +3. Reboot your system and select the "Xen 3.3 / XenLinux 2.6" menu option. After booting Xen, Linux will start and your initialisation scripts should execute in the usual way. diff --git a/xen/Makefile b/xen/Makefile index 7b0c28b421..97a286f1d2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,7 +1,7 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. -export XEN_VERSION = 4 -export XEN_SUBVERSION = 0 +export XEN_VERSION = 3 +export XEN_SUBVERSION = 3 export XEN_EXTRAVERSION ?= .0-rc3-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- cgit v1.2.3