X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=3017cd4d1ebbef3f299e9a22eaca6e631cdf8b33;hp=dde39aba4214cc33a0409c3673a4ac4df5ca9906;hb=99af50a89f5eb27e7e1c84aba01d72c06edc229a;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index dde39ab..3017cd4 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -134,35 +134,23 @@ config DEBUG_VIRTIO_SYM
 	help 
 	  Enable debugging for the Linux Virtio Symbiotic Device
 
+config LINUX_VIRTIO_NET
+        bool "Enable Virtio Network Device"
+        default n
+	depends on PCI && EXPERIMENTAL
+        help
+          Enable the Virtio Net
 
+config DEBUG_VIRTIO_NET
+        bool "Linux Virtio Net Debugging"
+        default n
+        depends on LINUX_VIRTIO_NET && DEBUG_ON
+        help
+          Enable debugging for the Linux Virtio Network Device
 
-config NE2K
-	bool "NE2K"
-	depends on EXPERIMENTAL
-	default n
-	help
-	  Includes the Virtual NE2K network card
 
-config DEBUG_NE2k
-	bool "NE2K debugging"
-	depends on NE2k && DEBUG_ON
-	help 
-	  Enable debugging for the NE2K
 
 
-config NET_CD
-	bool "Networked CD backend"
-	default y
-	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
-	help 
-	  Includes the Network CD backend
-
-config NET_HD
-	bool "Networked HD backend"
-	default y
-	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
-	help 
-	  Includes the Network HD backend
 
 
 config NVRAM
@@ -202,7 +190,7 @@ config PCI
 config PASSTHROUGH_PCI
 	bool "Passthrough PCI"
 	default y 
-	depends on PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL && SYMBIOTIC
 	help 
 	  Enables hardware devices to be passed through to the VM
 
@@ -240,24 +228,27 @@ config DEBUG_PIT
 	  Enable debugging for the PIT	
 
 
-
-
-config RAM_CD
-	bool "RAM based CD backend"
+config NETDISK
+	bool "NETDISK storage backend"
 	default y
-	depends on IDE || LINUX_VIRTIO_BLOCK
+	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
 	help 
-	  Includes the RAM based CD backend
+	  Includes the Network based disk backend
 
-config RAM_HD
-	bool "RAM based HD backend"
+config RAMDISK
+	bool "RAMDISK storage backend"
 	default y
 	depends on IDE || LINUX_VIRTIO_BLOCK
 	help 
-	  Includes the RAM based HD backend
-
+	  Includes the RAM based disk backend
 
 
+config TMPDISK
+	bool "TMPDISK storage backend"
+	default y
+	depends on IDE || LINUX_VIRTIO_BLOCK
+	help 
+	  Includes the temporary RAM disk 
 
 config SYM_SWAP
 	bool "Symbiotic Swap disk"
@@ -266,6 +257,20 @@ config SYM_SWAP
 	help 
 	  Includes the symbiotic ram based swap disk
 
+config SYM_SWAP2
+	bool "Symbiotic Swap disk v2"
+	default y
+	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	help 
+	  Includes the symbiotic ram based swap disk
+
+config DISK_MODEL
+	bool "Disk Performance Model"
+	default y
+	depends on LINUX_VIRTIO_BLOCK || IDE
+	help 
+	  Includes Performance model filter for disk operations
+
 config CGA
 	bool "CGA"
 	default n