From: Dave Hansen <dave.han...@linux.intel.com>
Right now, there is a "Enable paravirtualization code" option in
the "Processor Features" menu, which means Xen. There is also a
group of paravirtualization options specific to KVM under the
top-level "Virtualization" menu.
This creates a new hypervisor-independent arch/x86/Kconfig.virt
file, and moves the "Virtualization" menu to be defined in there.
This also removes the very counterintuitive references to
lguest/vhost code *from* kvm-specific code.
This also removes the silly:
depends on HAVE_KVM || X86
dependency. It makes zero sense to have entries defined in
arch/x86 depend on x86.
Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
Cc: Borislav Petkov <b...@suse.de>
Cc: Dmitry Torokhov <d...@vmware.com>
Cc: K. Y. Srinivasan <k...@microsoft.com>
Cc: Haiyang Zhang <haiya...@microsoft.com>
Cc: Alexander Graf <ag...@suse.de>
Cc: Gleb Natapov <g...@redhat.com>
Cc: Paolo Bonzini <pbonz...@redhat.com>
---
linux.git-davehans/arch/x86/Kconfig | 2 +-
linux.git-davehans/arch/x86/Kconfig.virt | 18 ++++++++++++++++++
linux.git-davehans/arch/x86/kvm/Kconfig | 19 -------------------
3 files changed, 19 insertions(+), 20 deletions(-)
diff -puN arch/x86/Kconfig~x86-Kconfig-move-paravirt-under-virtualization
arch/x86/Kconfig
--- linux.git/arch/x86/Kconfig~x86-Kconfig-move-paravirt-under-virtualization
2014-01-13 11:11:36.617255854 -0800
+++ linux.git-davehans/arch/x86/Kconfig 2014-01-13 11:11:36.620255990 -0800
@@ -2416,6 +2416,6 @@ source "security/Kconfig"
source "crypto/Kconfig"
-source "arch/x86/kvm/Kconfig"
+source "arch/x86/Kconfig.virt"
source "lib/Kconfig"
diff -puN /dev/null arch/x86/Kconfig.virt
--- /dev/null 2013-11-27 17:20:18.337162396 -0800
+++ linux.git-davehans/arch/x86/Kconfig.virt 2014-01-13 11:11:36.621256035
-0800
@@ -0,0 +1,18 @@
+
+menuconfig VIRTUALIZATION
+ bool "Virtualization"
+ default y
+ ---help---
+ Say Y here to get to see options for using your Linux host to run
other
+ operating systems inside virtual machines (guests).
+ This option alone does not add any kernel code.
+
+ If you say N, all options in this submenu will be skipped and
disabled.
+
+if VIRTUALIZATION
+
+source arch/x86/kvm/Kconfig
+source drivers/vhost/Kconfig
+source drivers/lguest/Kconfig
+
+endif # VIRTUALIZATION
diff -puN arch/x86/kvm/Kconfig~x86-Kconfig-move-paravirt-under-virtualization
arch/x86/kvm/Kconfig
---
linux.git/arch/x86/kvm/Kconfig~x86-Kconfig-move-paravirt-under-virtualization
2014-01-13 11:11:36.618255899 -0800
+++ linux.git-davehans/arch/x86/kvm/Kconfig 2014-01-13 11:11:36.621256035
-0800
@@ -4,19 +4,6 @@
source "virt/kvm/Kconfig"
-menuconfig VIRTUALIZATION
- bool "Virtualization"
- depends on HAVE_KVM || X86
- default y
- ---help---
- Say Y here to get to see options for using your Linux host to run
other
- operating systems inside virtual machines (guests).
- This option alone does not add any kernel code.
-
- If you say N, all options in this submenu will be skipped and
disabled.
-
-if VIRTUALIZATION
-
config KVM
tristate "Kernel-based Virtual Machine (KVM) support"
depends on HAVE_KVM
@@ -93,9 +80,3 @@ config KVM_DEVICE_ASSIGNMENT
If unsure, say Y.
-# OK, it's a little counter-intuitive to do this, but it puts it neatly under
-# the virtualization menu.
-source drivers/vhost/Kconfig
-source drivers/lguest/Kconfig
-
-endif # VIRTUALIZATION
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
