X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=64327907def679bf3dedbe724495bc64031a4e21;hb=51e81a720ed4c05dba61e9475a310d88f4f32e40;hp=d312c0b92796398acd911e6aa8f2d17a435de701;hpb=603e4c1a451138080ded3d4e3cd3b8716741db89;p=palacios.git

diff --git a/Kconfig b/Kconfig
index d312c0b..6432790 100644
--- a/Kconfig
+++ b/Kconfig
@@ -128,7 +128,7 @@ config MAX_CPUS
 endmenu
 
 source "palacios/src/interfaces/Kconfig"
-
+source "palacios/src/extensions/Kconfig"
 
 config TELEMETRY
 	bool "Enable VMM telemetry support"
@@ -163,39 +163,6 @@ config EXPERIMENTAL
 	  The purpose of this option is to allow features under development to be committed to the mainline
 	  to more easily track changes and provide access to multiple developers
 
-config VNET
-        depends on EXPERIMENTAL
-        bool "Enable Vnet in Palacios"
-        default n
-        help
-          Enable the Vnet in Palacios
-
-
-config INSPECTOR
-	bool "Enable VM inspection"
-	depends on EXPERIMENTAL
-	default n
-	help 
-	  Enable inspection framework for vm internal state
-
-config SYSCALL_HIJACK
-    bool "Enable System Call Interposition"
-    depends on EXPERIMENTAL
-    default n
-    help
-      Enable the VMM to hijack system calls executed by the guest.
-      If enabled, the VMM will intercept software interrupt (INT) instructions,
-      Fast-System Call instructions (SYSENTER, SYSCALL), and the LIDT instruction
-
-config HIJACK_SYSCALL_MSR
-    bool "Intercept Syscall-related MSR reads & writes"
-    depends on SYSCALL_HIJACK 
-    default n
-    help
-      Allow the VMM to intercept reads and writes to MSRs
-      related to SYSCALL and SYSENTER instructions. Specifically,
-      it will intercept R/W to STAR, CSTAR, and LSTAR.
-
 endmenu
 
 
@@ -309,8 +276,24 @@ menuconfig SYMMOD
 
 endmenu
 
+menu "VNET"
+
+config VNET
+        bool "Enable Vnet in Palacios"
+        default n
+        help
+          Enable the Vnet in Palacios
+
+config DEBUG_VNET
+        depends on VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
 
 
+endmenu
+
 menu "Debug configuration"
 
 config CONFIG_DEBUG_INFO
@@ -419,20 +402,12 @@ config DEBUG_DEV_MGR
 	help 
 	  This turns on debugging for the device manager
 
-config DEBUG_VNET
-        depends on EXPERIMENTAL && VNET
-        bool "Enable Vnet Debug in Palacios"
-        default n
-        help
-          Enable the Vnet debug in Palacios
-
-config DEBUG_SYSCALL_HIJACK
-        bool "Enable Syscall hijack Debug in Palacios"
-        default n
-        depends on EXPERIMENTAL && SYSCALL_HIJACK && DEBUG_ON
-        help
-          Enable Debugging printouts for syscall hijacking
-          code in Palacios
+config DEBUG_MEM_ERRORS
+    bool "Verbose memory errors"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on debugging for memory translations and lookups
 
 endmenu