X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=8fc349ca16e7fcd2d45a6ed1dc0da0dd8ecc23ac;hp=2f5e959dda057506c117059b44fbf1f877baffb5;hb=5369ce5538c09af0966abc91bc7cf142e8b29b8a;hpb=46b8faf02be8ec628db5683bc6fdb55e72344c18

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 2f5e959..8fc349c 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -93,7 +93,7 @@ config DEBUG_KEYBOARD
 
 config LINUX_VIRTIO_BALLOON
 	bool "Linux Virtio Balloon Device"
-	default y
+	default n
 	depends on PCI
 	help 
 	  Includes the Linux virtio balloon device
@@ -108,7 +108,7 @@ config DEBUG_VIRTIO_BALLOON
 
 config LINUX_VIRTIO_BLOCK
 	bool "Linux Virtio Block Device"
-	default y
+	default n
 	depends on PCI
 	help 
 	  Includes the Linux virtio block device
@@ -122,7 +122,7 @@ config DEBUG_VIRTIO_BLOCK
 
 config LINUX_VIRTIO_SYM
 	bool "Linux Virtio Symbiotic Device"
-	default y
+	default n
 	depends on PCI && SYMBIOTIC
 	help 
 	  Includes the Linux virtio symbiotic device
@@ -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
@@ -199,6 +187,13 @@ config PCI
 	help
 	  Includes the Virtual PCI Bus
 
+config PASSTHROUGH_PCI
+	bool "Passthrough PCI"
+	default y 
+	depends on PCI && EXPERIMENTAL && SYMBIOTIC
+	help 
+	  Enables hardware devices to be passed through to the VM
+
 config DEBUG_PCI
 	bool "PCI debugging"
 	depends on PCI && DEBUG_ON
@@ -233,37 +228,63 @@ 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"
-	default y
+	default n
 	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
 	help 
 	  Includes the symbiotic ram based swap disk
 
-config VIDEO
-	bool "VIDEO"
-	default y
-	depends on PCI && EXPERIMENTAL
+config SYM_SWAP2
+	bool "Symbiotic Swap disk v2"
+	default n
+	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	help 
+	  Includes the symbiotic ram based swap disk
+
+config DISK_MODEL
+	bool "Disk Performance Model"
+	default n
+	depends on LINUX_VIRTIO_BLOCK || IDE
+	help 
+	  Includes Performance model filter for disk operations
+
+config CGA
+	bool "CGA"
+	default n
+	depends on !PASSTHROUGH_VIDEO
 	help
-	  Includes the Virtual Video Card Device
+	  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
+