Merge branch 'devel' of newskysaw.cs.northwestern.edu:/home/palacios/palacios into...

[palacios.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index a524683..9a7f7e7 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -76,6 +76,12 @@ config VMX
          Compile with support for Intel VMX
 
 
+config FRAME_POINTER
+       bool "Compile with Frame pointers"
+       default n
+       help
+         Compiles the Palacios library with Frame pointers
+
 config DEBUG_INFO
        bool "Compile with Debug Information"
        default n
@@ -163,12 +169,12 @@ 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 CHECKPOINT
+       bool "Enable Checkpointing"
+       default n
+       help 
+         Temporary option to enable experimental checkpoint code
+
 
 
 endmenu
@@ -284,15 +290,25 @@ menuconfig SYMMOD
 
 endmenu
 
+menu "VNET"
 
+config VNET
+        bool "Enable Vnet in Palacios"
+        default n
+        help
+          Enable the Vnet in Palacios
 
-menu "Debug configuration"
+config DEBUG_VNET
+        depends on VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
 
-config CONFIG_DEBUG_INFO
-       bool "Compile with Debug information"
-       default n
-       help 
-        This adds the -g flag to the compilation flags
+
+endmenu
+
+menu "Debug configuration"
 
 
 ## Is unwind information useful
@@ -394,12 +410,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_MEM_ERRORS
+    bool "Verbose memory errors"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on debugging for memory translations and lookups
 
 endmenu