X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=dbce08b3fade659af0527b3d23a91366521ef800;hp=6d1a568cbbd48e82906805653c7120736055da36;hb=0121a4503305424096e2b5c5bd3b6c3af2d813e5;hpb=c551bbb4b8097db14632f43acc27b55b054c13a4

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 6d1a568..dbce08b 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -137,6 +137,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
+	depends on PCI
         help
           Enable the Virtio Net
 
@@ -162,19 +163,7 @@ config DEBUG_NE2k
 	  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
@@ -252,24 +241,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"
@@ -278,6 +270,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