Xen devel - Jun 2009 - switch to using pvops kernel by default for Linux

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r 2656ab6fa828 buildconfigs/enable-xen-config
--- a/buildconfigs/enable-xen-config	Fri May 08 11:50:12 2009 +0100
+++ b/buildconfigs/enable-xen-config	Mon Jun 08 16:18:59 2009 +0100
@@ -45,7 +45,8 @@
 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_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 2656ab6fa828 config/Linux.mk
--- a/config/Linux.mk	Fri May 08 11:50:12 2009 +0100
+++ b/config/Linux.mk	Mon Jun 08 16:18:59 2009 +0100
@@ -1,7 +1,7 @@
 include $(XEN_ROOT)/config/StdGNU.mk
 
 # You may use wildcards, e.g. KERNELS=*2.6*
-KERNELS ?= linux-2.6-xen
+KERNELS ?= linux-2.6-pvops
 
 XKERNELS := $(foreach kernel, $(KERNELS), \
               $(patsubst buildconfigs/mk.%,%, \



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

[second version, leave ia64 on 2.6.18 since it currently has no dom0
support in pvops].
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r 2656ab6fa828 -r a6f838b27548 buildconfigs/enable-xen-config
--- a/buildconfigs/enable-xen-config	Fri May 08 11:50:12 2009 +0100
+++ b/buildconfigs/enable-xen-config	Wed Jun 10 10:35:33 2009 +0100
@@ -45,7 +45,8 @@
 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_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 2656ab6fa828 -r a6f838b27548 config/Linux.mk
--- a/config/Linux.mk	Fri May 08 11:50:12 2009 +0100
+++ b/config/Linux.mk	Wed Jun 10 10:35:33 2009 +0100
@@ -1,7 +1,11 @@
 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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel