X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=3017cd4d1ebbef3f299e9a22eaca6e631cdf8b33;hp=4a5110133d44328d9a6c97a23ff38054fa04a24f;hb=99af50a89f5eb27e7e1c84aba01d72c06edc229a;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 4a51101..3017cd4 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -134,20 +134,20 @@ 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
 
 
 
@@ -190,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
 
@@ -257,6 +257,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