X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=30fb2b12e2ee158d87069621f0e9f361ded5bc76;hp=1664821cb4e005d02499bae38a589b2e3fea80c9;hb=ddd9fd13627552b915753b06be997921cc904466;hpb=3373500a962dba67f09d120d7db3c2ea1d4beee2

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 1664821..30fb2b1 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
@@ -137,6 +137,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
+	depends on PCI && EXPERIMENTAL
         help
           Enable the Virtio Net
 
@@ -148,19 +149,6 @@ config DEBUG_VIRTIO_NET
           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
-
 
 
 
@@ -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
 
@@ -264,11 +252,25 @@ config TMPDISK
 
 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 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
@@ -284,5 +286,13 @@ config TELNET_CONSOLE
 	help
 	  Includes the virtual telnet console 
 
+
+config CURSES_CONSOLE
+	bool "Curses Virtual Console"
+	default n
+	depends on CGA && !PASSTHROUGH_VIDEO
+	help
+	  Includes the virtual curses console 
+
 endmenu