rpms/kernel-xen-2.6/devel kernel-2.6.20-i686-xen.config, 1.1, 1.2 kernel-2.6.20-x86_64-xen.config, 1.2, 1.3 kernel-xen.spec, 1.22, 1.23

[Juan Quintela (quintela)]

Author: quintela

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7074

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
disable kvm on xen builds


Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-2.6.20-i686-xen.config	22 Mar 2007 16:01:16 -0000	1.1
+++ kernel-2.6.20-i686-xen.config	8 May 2007 07:27:02 -0000	1.2
@@ -3230,9 +3230,7 @@
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PROC_VMCORE=y
 CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
+# CONFIG_KVM is not set
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 CONFIG_XEN_PCIDEV_FRONTEND=y


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel-2.6.20-x86_64-xen.config	22 Mar 2007 17:41:32 -0000	1.2
+++ kernel-2.6.20-x86_64-xen.config	8 May 2007 07:27:02 -0000	1.3
@@ -3150,9 +3150,7 @@
 CONFIG_MSI_LAPTOP=m
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
+# CONFIG_KVM is not set
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 CONFIG_XEN_PCIDEV_FRONTEND=y


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kernel-xen.spec	8 May 2007 07:17:17 -0000	1.22
+++ kernel-xen.spec	8 May 2007 07:27:02 -0000	1.23
@@ -2011,6 +2011,9 @@
 #  - tux.
 
 %changelog
+* Tue May  8 2007  <quintela at redhat.com>
+- Disable kvm on xen kernels
+
 * Fri May 04 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Updated Xen Hypervisor tarball to 3.1.0-rc7, hg cset 7041b52471c3