rpms/kernel/devel config-x86-generic, 1.42, 1.43 config-x86_64-generic, 1.41, 1.42

[Mark McLoughlin (markmc)]

Author: markmc

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
Slightly re-org virt related configs

Get all OCD on virt related configs - bring them together,
separate the host stuff from the guest stuff and make the
x86_64 config look much more like the x86 config.




Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- config-x86-generic	23 Jul 2008 19:51:09 -0000	1.42
+++ config-x86-generic	24 Jul 2008 16:38:41 -0000	1.43
@@ -318,9 +318,6 @@
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_W83697HF_WDT=m
 
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-
 CONFIG_RELOCATABLE=y
 CONFIG_PHYSICAL_ALIGN=0x400000
 CONFIG_PHYSICAL_START=0x400000
@@ -331,12 +328,21 @@
 
 CONFIG_VIDEO_CAFE_CCIC=m
 
+CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_TRACE=y
+CONFIG_LGUEST=m
+
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
-CONFIG_KVM_TRACE=y
+# CONFIG_XEN is not set
+CONFIG_LGUEST_GUEST=y
+CONFIG_VMI=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -360,14 +366,6 @@
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
 
-CONFIG_VIRTUALIZATION=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_VMI=y
-CONFIG_LGUEST=m
-CONFIG_LGUEST_GUEST=y
-# CONFIG_XEN is not set
-# CONFIG_HVC_XEN is not set
-
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- config-x86_64-generic	21 Jul 2008 19:45:13 -0000	1.41
+++ config-x86_64-generic	24 Jul 2008 16:38:41 -0000	1.42
@@ -1,6 +1,5 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-# CONFIG_XEN is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y
@@ -227,11 +226,6 @@
 
 # CONFIG_VIDEO_CAFE_CCIC is not set
 
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_TRACE=y
-
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 
@@ -254,18 +248,23 @@
 CONFIG_CPU_IDLE_GOV_MENU=y
 
 CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_TRACE=y
+
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+# CONFIG_XEN is not set
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
 
 CONFIG_SENSORS_I5K_AMB=m
 
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set