reverted naming changes to fix configuration breakage

[palacios.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index a9cc6ac..b9af306 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -74,13 +74,6 @@ config SHADOW_PAGING_TELEMETRY
          Enable telemetry information for shadow paging 
 
 
-config PASSTHROUGH_VIDEO
-       bool "Enable Passthrough Video"
-       default y
-       help 
-         Configures Palacios to map a guest's framebuffer directly 
-         to the hardware framebuffer
-
 config INSTRUMENT_VMM
        bool "Enable VMM instrumentation"
        default n
@@ -108,6 +101,34 @@ config VNET
         help
           Enable the Vnet in Palacios
 
+config DEBUG_VNET
+        depends on EXPERIMENTAL && VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
+
+config VNET_PROFILE
+       depends on EXPERIMENTAL && VNET
+       bool "Enable Vnet Profiling in Palacios"
+       default n
+       help
+          Enable the Vnet performance profiling in Palacios
+
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET
+        help
+          Enable the Virtio VNET interface
+
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "VNET Virtio Device Debugging"
+        default n
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
+        help
+          Enable debugging for the VNET Virtio Device
+
 endmenu
 
 
@@ -148,9 +169,8 @@ config SYMBIOTIC
        bool "Enable Symbiotic Functionality"
        default n
        help 
-         Enable Symbiotic components of the VMM
-
-
+         Enable Symbiotic components of the VMM. 
+         This includes the SymSpy interface.
 
 config SYMCALL
        bool "Symbiotic upcalls"
@@ -159,27 +179,34 @@ config SYMCALL
        help
          Enables the Symbiotic upcall interface
 
-config SYMMOD
+config SWAPBYPASS
+       bool "SwapBypass"
+       default n
+       depends on SYMBIOTIC && SYMCALL && EXPERIMENTAL
+       help 
+         This enables the SwapBypass architecture
+
+config SWAPBYPASS_TELEMETRY
+       bool "Enable SwapBypass Telemetry"
+       default n
+       depends on TELEMETRY && SWAPBYPASS
+       help 
+         Enable the telemetry information for the SwapBypass subsystem
+
+menuconfig SYMMOD 
        bool "Symbiotic Modules"
        default n
-       depends on SYMBIOTIC && EXPERIMENTAL
+       depends on EXPERIMENTAL
+#      depends on SYMBIOTIC
        help
          Enable Symbiotic module loading
 
+if SYMMOD
 
-config SYMBIOTIC_SWAP
-       bool "Symbiotic Swap"
-       default n
-       depends on SYMBIOTIC && SYMCALL && EXPERIMENTAL
-       help 
-         This enables the symbiotic swap architecture
+source "modules/Kconfig"
+
+endif
 
-config SYMBIOTIC_SWAP_TELEMETRY
-       bool "Enable Symbiotic Swap Telemetry"
-       default n
-       depends on TELEMETRY && SYMBIOTIC_SWAP
-       help 
-         Enable the telemetry information for the symbiotic swap subsystem
 
 
 endmenu