[patch 6/7] Slightly re-org virt related configs

[Mark McLoughlin]

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: devel/config-x86-generic
===================================================================
--- devel.orig/config-x86-generic	2008-07-23 09:49:15.000000000 +0100
+++ devel.orig/config-x86-generic	2008-07-23 09:49:15.000000000 +0100
@@ -318,9 +318,6 @@ CONFIG_SONY_LAPTOP=m
 # 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_CRYPTO_DEV_GEODE=m

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_DMIID=y
 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: devel/config-x86_64-generic
===================================================================
--- devel.orig/config-x86_64-generic	2008-07-23 09:49:15.000000000 +0100
+++ devel.orig/config-x86_64-generic	2008-07-23 09:49:15.000000000 +0100
@@ -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_W83697HF_WDT=m

# 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=y
 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