X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=24b64809b5352ae26e7c3bc80bbf5fdddb8974f6;hb=refs%2Fheads%2Fdevel;hp=6b2cf2a283d9eeadafd15c45e84dff98ca9ae995;hpb=f1c8d924817188c4f08a97205e97392ff304913f;p=palacios.git

diff --git a/Kconfig b/Kconfig
index 6b2cf2a..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
 
@@ -50,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"
@@ -709,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"