Make building the VM optional
authorRonald G. Minnich <rminnich@google.com>
Sat, 8 Mar 2014 05:02:00 +0000 (21:02 -0800)
committerRonald G. Minnich <rminnich@google.com>
Sat, 8 Mar 2014 05:02:00 +0000 (21:02 -0800)
It doesn't work anyway.

Signed-off-by: Ronald G. Minnich <rminnich@google.com>
Kconfig
kern/arch/x86/Kbuild
kern/drivers/dev/Kbuild

diff --git a/Kconfig b/Kconfig
index 4f19e05..7137be5 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -166,6 +166,13 @@ config PRINTK_NO_BACKSPACE
 
 endmenu
 
+config VM
+       bool "Virtual Machine support"
+       default n
+       help
+               VM support -- not working! Based on KVM.
+
+
 menu "Misc/Old Options"
 
 config ARSC_SERVER
index 34f01d5..8ed739b 100644 (file)
@@ -5,7 +5,6 @@ obj-y                                           += console.o
 obj-y                                          += cpuinfo.o
 obj-y                                          += devarch.o
 obj-y                                          += entry$(BITS).o
-obj-y                                          += emulate.o
 obj-y                                          += frontend.o
 obj-y                                          += init.o
 obj-y                                          += ioapic.o
@@ -25,5 +24,8 @@ obj-y                                         += smp_boot.o
 obj-y                                          += smp_entry$(BITS).o
 obj-y                                          += trap.o trap$(BITS).o
 obj-y                                          += trapentry$(BITS).o
-obj-y                                          += vmx.o
-obj-y                                          += vmx_mmu.o
+
+# Virtual machine support. Optional.
+obj-$(CONFIG_VM)                               += emulate.o
+obj-$(CONFIG_VM)                               += vmx.o
+obj-$(CONFIG_VM)                               += vmx_mmu.o
index ea4937d..4f4db28 100644 (file)
@@ -8,4 +8,6 @@ obj-y                                           += mnt.o
 obj-y                                          += pipe.o
 obj-y                                          += root.o
 obj-y                                          += srv.o
-obj-y                                          += vm.o
+
+# VM support. Optional.
+obj-$(CONFIG_VM)                               += vm.o