[Xen-changelog] [xen-unstable] x86: Switch to using pvops kernel by default for Linux

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245147348 -3600
# Node ID 7f9286d21706d6cf06441adc285188fc27ae780d
# Parent  6e2f1bba71e998638be95d2187543681dc3d60fe
x86: Switch to using pvops kernel by default for Linux

Keave ia64 on 2.6.18 since it currently has no dom0 support in pvops

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 buildconfigs/enable-xen-config |    6 +++++-
 config/Linux.mk                |    4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff -r 6e2f1bba71e9 -r 7f9286d21706 buildconfigs/enable-xen-config
--- a/buildconfigs/enable-xen-config    Tue Jun 16 11:11:59 2009 +0100
+++ b/buildconfigs/enable-xen-config    Tue Jun 16 11:15:48 2009 +0100
@@ -45,7 +45,8 @@ setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32
 setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32
 setopt CONFIG_XEN_DEBUG_FS y
 setopt CONFIG_XEN_DOM0 y
-
+setopt CONFIG_XEN_SYS_HYPERVISOR y
+setopt CONFIG_XEN_GNTDEV y
 setopt CONFIG_VMI y
 
 setopt CONFIG_KVM y
@@ -72,6 +73,9 @@ setopt CONFIG_INTR_REMAP n
 setopt CONFIG_INTR_REMAP n
 setopt CONFIG_GFS2_FS n
 setopt CONFIG_IOMMU_DEBUG n
+setopt CONFIG_X86_MCE_INTEL n
+setopt CONFIG_X86_MCE_AMD n
+setopt CONFIG_CRYPTO_AES_NI_INTEL n
 
 case ${XEN_TARGET_ARCH} in
     x86_32) setopt CONFIG_64BIT n ;;
diff -r 6e2f1bba71e9 -r 7f9286d21706 config/Linux.mk
--- a/config/Linux.mk   Tue Jun 16 11:11:59 2009 +0100
+++ b/config/Linux.mk   Tue Jun 16 11:15:48 2009 +0100
@@ -1,7 +1,11 @@ include $(XEN_ROOT)/config/StdGNU.mk
 include $(XEN_ROOT)/config/StdGNU.mk
 
 # You may use wildcards, e.g. KERNELS=*2.6*
+ifeq (ia64,$(XEN_TARGET_ARCH))
 KERNELS ?= linux-2.6-xen
+else
+KERNELS ?= linux-2.6-pvops
+endif
 
 XKERNELS := $(foreach kernel, $(KERNELS), \
               $(patsubst buildconfigs/mk.%,%, \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog