Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

[palacios-OLD.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index ec9fe60..bb241ee 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -182,6 +182,20 @@ config DEBUG_LINUX_VIRTIO_VNET
         help
           Enable debugging for the VNET Virtio Device
 
+config LINUX_VNET_BRIDGE
+        bool "Enable VNET Bridge for Linux host"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET && LINUX
+        help
+          Enable the VNET Bridge for Linux host
+
+config DEBUG_LINUX_VNET_BRIDGE
+        bool "VNET Host Linux Bridge Debug"
+        default n
+        depends on LINUX_VNET_BRIDGE && DEBUG_ON && LINUX
+        help
+          Enable debugging for the VNET Host Linux Bridge
+
 endmenu
 
 
@@ -212,6 +226,14 @@ config DEBUG_SHDW_PG_VTLB
        help
          Enables debugging messages for VTLB implementation
 
+config SHADOW_PAGING_CACHE1
+       bool "Shadow Page Cache (1)"
+       default y
+       depends on SHADOW_PAGING
+       help 
+          Enables caching implemenation for shadow paging
+
+
 endmenu