X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=4a5110133d44328d9a6c97a23ff38054fa04a24f;hb=3d9181a002f5f30881ee53fff4ec1b2ab8395b0a;hp=76d81874d8846aa1493d049082def7f5885a2626;hpb=2b21111e5aec30a54f47383a11b179b0bd226463;p=palacios.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 76d8187..4a51101 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -150,19 +150,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
@@ -199,6 +187,13 @@ config PCI
 	help
 	  Includes the Virtual PCI Bus
 
+config PASSTHROUGH_PCI
+	bool "Passthrough PCI"
+	default y 
+	depends on PCI && EXPERIMENTAL
+	help 
+	  Enables hardware devices to be passed through to the VM
+
 config DEBUG_PCI
 	bool "PCI debugging"
 	depends on PCI && DEBUG_ON
@@ -233,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"
@@ -259,4 +257,20 @@ config SYM_SWAP
 	help 
 	  Includes the symbiotic ram based swap disk
 
+config CGA
+	bool "CGA"
+	default n
+	depends on !PASSTHROUGH_VIDEO
+	help
+	  Includes the Virtual CGA video support
+
+
+config TELNET_CONSOLE
+	bool "Telnet Virtual Console"
+	default n
+	depends on CGA && !PASSTHROUGH_VIDEO
+	help
+	  Includes the virtual telnet console 
+
 endmenu
+