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

[palacios.git] / palacios / src / devices / Kconfig

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 456d717..7222c48 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -155,7 +155,7 @@ config DEBUG_VIRTIO_NET
 config VNET_NIC
         bool "Enable VNET VIrtio NIC Device"
         default n
-       depends on PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL && VNET
         help
           Enable the VNET Virtio backend device
 
@@ -181,6 +181,20 @@ config DEBUG_NE2k
          Enable debugging for the NE2K
 
 
+config NIC_BRIDGE
+        bool "Enable Direct Bridge to Host network"
+        default n
+        depends on EXPERIMENTAL && PACKET
+        help
+          Enable Host Direct Network Bridge backend device for all network front devices
+
+config DEBUG_NIC_BRIDGE
+        bool "Debugging Direct Bridge to Host network"
+        default n
+        depends on NIC_BRIDGE && DEBUG_ON
+        help
+          Enable Debugging on Host Direct Network Bridge backend device
+
 
 
 
@@ -265,6 +279,11 @@ config FILEDISK
        help
          Includes the file based disk backend
 
+config DEBUG_FILEDISK
+       bool "FILEDISK backend debugging"
+       depends on FILEDISK && DEBUG_ON
+       help 
+         Enable debugging for the file based disk backend      
 
 config NETDISK
        bool "NETDISK storage backend"
@@ -280,6 +299,11 @@ config RAMDISK
        help 
          Includes the RAM based disk backend
 
+config DEBUG_RAMDISK
+       bool "RAMDISK baskend debugging"
+       depends on RAMDISK && DEBUG_ON
+       help 
+         Enable debugging for the ram based disk backend       
 
 config TMPDISK
        bool "TMPDISK storage backend"
@@ -337,11 +361,11 @@ config SERIAL_UART
        help 
          Include virtual serial port
 
-config STREAM
-       bool "Stream device"
+config CHAR_STREAM
+       bool "Stream based character frontend"
        default n
        help
-         Stream Device
+         Include Stream based character device frontend
 
 endmenu