X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=d6c5202b5c566eeba18cdd8fbd42b18636d84646;hb=72b46c150b774d64c5e971ac4575c86142c5a509;hp=a5847ef009b23c2c54d802e53cb4b6ad7a916dcf;hpb=e1dcef8166cab60ca0304121ddd176760af0d3d6;p=palacios-OLD.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index a5847ef..d6c5202 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -147,7 +147,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-	depends on PCI
+	depends on PCI && EXPERIMENTAL
         help
           Enable the Virtio Net
 
@@ -158,6 +158,20 @@ config DEBUG_VIRTIO_NET
         help
           Enable debugging for the Linux Virtio Network Device
 
+config VNET_NIC
+        bool "Enable VNET NIC Device"
+        default n
+	depends on PCI && EXPERIMENTAL
+        help
+          Enable the VNET NIC backend device
+
+config VNET_NIC_NET
+        bool "VNET NIC Device Debugging"
+        default n
+        depends on VNET_NIC && DEBUG_ON
+        help
+          Enable debugging for the VNET NIC Device
+
 
 config NE2K
 	bool "NE2K"
@@ -273,19 +287,19 @@ config TMPDISK
 	help 
 	  Includes the temporary RAM disk 
 
-config SYM_SWAP
-	bool "Symbiotic Swap disk"
+config SWAPBYPASS_DISK_CACHE
+	bool "SwapBypass disk cache"
 	default y
-	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	depends on SWAPBYPASS && (LINUX_VIRTIO_BLOCK || IDE)
 	help 
-	  Includes the symbiotic ram based swap disk
+	  Includes the SwapBypass ram based swap disk cache
 
-config SYM_SWAP2
-	bool "Symbiotic Swap disk v2"
+config SWAPBYPASS_DISK_CACHE2
+	bool "SwapBypass disk cache v2"
 	default y
-	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	depends on SWAPBYPASS && (LINUX_VIRTIO_BLOCK || IDE)
 	help 
-	  Includes the symbiotic ram based swap disk
+	  Includes the SwapBypass ram based swap disk cache
 
 config DISK_MODEL
 	bool "Disk Performance Model"
@@ -309,5 +323,6 @@ config TELNET_CONSOLE
 	help
 	  Includes the virtual telnet console 
 
+
 endmenu