X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=24b64809b5352ae26e7c3bc80bbf5fdddb8974f6;hb=d85300ed95766164d14a7f3b6c1c681b8b9a9c52;hp=e8cae689488664f5183e35276c6778599266639e;hpb=3650bf4aaa4f83afae52c8fee98fce6e3ee68deb;p=palacios.git

diff --git a/Kconfig b/Kconfig
index e8cae68..24b6480 100644
--- a/Kconfig
+++ b/Kconfig
@@ -3,7 +3,7 @@ mainmenu "Palacios VMM Configuration"
 menu "Target Configuration"
 
 
-choice
+choice 
 	prompt "Target Host OS"
 	default KITTEN
 
@@ -31,6 +31,9 @@ config LINUX
 	select BUILT_IN_STDLIB
 	select BUILT_IN_STRDUP
 	select BUILT_IN_ATOI
+        select BUILT_IN_STRTOX
+        select BUILT_IN_STRTOI
+        select BUILT_IN_ATOX
 	select FILE
 	select V3_DECODER
 	help
@@ -47,7 +50,24 @@ config LINUX_KERN
 config MINIX
 	bool "MINIX 3"
 	help
-	  This enables the necesary options to compile Palacios with Kitten
+	  This enables the necesary options to compile Palacios with Minix
+
+config NAUTILUS
+	bool "Nautilus"
+	select V3_DECODER
+        select FRAME_POINTER
+	help
+	  This enables the necessary options to compile Palacios 
+          for inclusion in the Nautilus kernel
+
+config NAUTILUS_KERN
+	depends on NAUTILUS
+	string "Nautilus Kernel Source directory" 
+	default "../nautilus"
+	help 
+	  This is the directory containing the 
+          Nautilus sources
+
 
 config OTHER_OS
 	bool "Other OS"
@@ -186,6 +206,26 @@ config LAZY_FP_SWITCH
           the floating point state is explicitly saved on each exit
           and restored on each entry---this save/restore is entirely
           done in Palacios.
+
+config CACHEPART
+        bool "Support last-level cache partitioning"
+        depends on CACHE_INFO && EXPERIMENTAL
+        default y
+        help 
+          When true, <cachepart> can be used to select which page colors
+          are allowed to be used by the VM, thus limiting it to a portion
+          of the last level shared cache. 
+          This is an experimental option and requires a lot of careful
+          configuration to work.  In particular, memory base regions must be
+          a page size, and initial allocation of the VM may take a long
+          time depending on the host's page allocator. 
+
+config DEBUG_CACHEPART
+	bool "Enable debugging of cache partitioning"
+	depends on CACHEPART
+	default n
+	help
+	  Generate output from the debugging statements in cache partitioning
           
 
 endmenu
@@ -616,6 +656,7 @@ menu "Symbiosis"
 config SYMBIOTIC
 	bool "Enable Symbiotic Functionality"
 	default n
+        depends on BOCHSBIOS
 	help 
 	  Enable Symbiotic components of the VMM. 
 	  This includes the SymSpy interface.
@@ -644,8 +685,7 @@ config SWAPBYPASS_TELEMETRY
 menuconfig SYMMOD 
 	bool "Symbiotic Modules"
 	default n
-	depends on EXPERIMENTAL
-#	depends on SYMBIOTIC
+	depends on EXPERIMENTAL && SYMBIOTIC
 	help
 	  Enable Symbiotic module loading
 
@@ -686,6 +726,29 @@ config HVM
           a part ("the HRT") that supports Hybrid Run-Times,
           for example Nautilus-based HRTs for parallel languages.
 
+choice 
+	prompt "HVM Magic Upcall Mechanism"
+	default HVM_UPCALL_MAGIC_GPF
+
+config HVM_UPCALL_MAGIC_GPF
+	bool "GPF"
+	help
+	 Upcall using a #GP with a well-known magic error code
+
+config HVM_UPCALL_MAGIC_PF
+	bool "Page Fault"
+	help
+	 Upcall using a #PF with a well-known magic address and error code
+
+config HVM_UPCALL_MAGIC_SWINT
+	bool "Software interrupt"
+	help
+	 Upcall using a software interrupt with a vector specified by 
+         the VM's configuration
+endchoice
+
+	
+
 config DEBUG_HVM
         depends on HVM
         bool "Enable HVM debugging in Palacios"