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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 4a51101..b5e625e 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -1,8 +1,9 @@
 menu "Virtual Devices"
 
 config APIC
-	bool "APIC"
+	bool "APIC" 
 	default y
+	depends on ICC_BUS
 	help 
 	  Includes the Virtual APIC device
 
@@ -15,6 +16,29 @@ config DEBUG_APIC
 	  Enable debugging for the APIC
 
 
+
+config IO_APIC
+	bool "IOAPIC"
+	depends on ICC_BUS
+	default y
+	help 
+	  Includes the Virtual IO APIC
+
+config DEBUG_IO_APIC
+	bool "IO APIC Debugging"
+	default n
+	depends on IO_APIC && DEBUG_ON 
+	help 
+	  Enable debugging for the IO APIC
+
+
+config ICC_BUS
+	bool "ICC BUS"
+	default y
+	help 
+	  The ICC Bus for APIC/IOAPIC communication
+
+
 config BOCHS_DEBUG
 	bool "Bochs Debug Console Device"
 	default y
@@ -60,20 +84,6 @@ config DEBUG_IDE
 	  Enable debugging for the IDE Layer
 
 
-config IO_APIC
-	bool "IOAPIC"
-	depends on APIC
-	default y
-	help 
-	  Includes the Virtual IO APIC
-
-config DEBUG_IO_APIC
-	bool "IO APIC Debugging"
-	default n
-	depends on IO_APIC && DEBUG_ON 
-	help 
-	  Enable debugging for the IO APIC
-
 
 
 
@@ -134,6 +144,33 @@ 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 VNET_NIC
+        bool "Enable VNET VIrtio NIC Device"
+        default n
+	depends on PCI && EXPERIMENTAL
+        help
+          Enable the VNET Virtio backend device
+
+config DEBUG_VNET_NIC
+        bool "VNET NIC Device Debugging"
+        default n
+        depends on VNET_NIC && DEBUG_ON
+        help
+          Enable debugging for the VNET NIC Device
 
 
 config NE2K
@@ -190,7 +227,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
 
@@ -250,12 +287,26 @@ config TMPDISK
 	help 
 	  Includes the temporary RAM disk 
 
-config SYM_SWAP
-	bool "Symbiotic Swap disk"
+config SWAPBYPASS_DISK_CACHE
+	bool "SwapBypass disk cache"
+	default y
+	depends on SWAPBYPASS && (LINUX_VIRTIO_BLOCK || IDE)
+	help 
+	  Includes the SwapBypass ram based swap disk cache
+
+config SWAPBYPASS_DISK_CACHE2
+	bool "SwapBypass disk cache v2"
 	default y
-	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	depends on SWAPBYPASS && (LINUX_VIRTIO_BLOCK || IDE)
 	help 
-	  Includes the symbiotic ram based swap disk
+	  Includes the SwapBypass ram based swap disk cache
+
+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"
@@ -272,5 +323,6 @@ config TELNET_CONSOLE
 	help
 	  Includes the virtual telnet console 
 
+
 endmenu