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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index dbce08b..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
@@ -137,7 +137,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-	depends on PCI
+	depends on PCI && EXPERIMENTAL
         help
           Enable the Virtio Net
 
@@ -149,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
-
 
 
 
@@ -203,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
 
@@ -265,21 +252,21 @@ 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 y
+	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 y
+	default n
 	depends on LINUX_VIRTIO_BLOCK || IDE
 	help 
 	  Includes Performance model filter for disk operations