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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 6d1a568..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
-
 
 
 
@@ -137,6 +147,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
 
@@ -147,6 +158,20 @@ config DEBUG_VIRTIO_NET
         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
 	bool "NE2K"
@@ -162,19 +187,7 @@ config DEBUG_NE2k
 	  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
@@ -214,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
 
@@ -252,31 +265,48 @@ config DEBUG_PIT
 	  Enable debugging for the PIT	
 
 
+config NETDISK
+	bool "NETDISK storage backend"
+	default y
+	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
+	help 
+	  Includes the Network based disk backend
 
-
-config RAM_CD
-	bool "RAM based CD backend"
+config RAMDISK
+	bool "RAMDISK storage backend"
 	default y
 	depends on IDE || LINUX_VIRTIO_BLOCK
 	help 
-	  Includes the RAM based CD backend
+	  Includes the RAM based disk backend
 
-config RAM_HD
-	bool "RAM based HD backend"
+
+config TMPDISK
+	bool "TMPDISK storage backend"
 	default y
 	depends on IDE || LINUX_VIRTIO_BLOCK
 	help 
-	  Includes the RAM based HD backend
-
+	  Includes the temporary RAM 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 SWAPBYPASS && (LINUX_VIRTIO_BLOCK || IDE)
+	help 
+	  Includes the SwapBypass ram based swap disk cache
 
-config SYM_SWAP
-	bool "Symbiotic Swap disk"
+config DISK_MODEL
+	bool "Disk Performance Model"
 	default y
-	depends on SYMBIOTIC_SWAP && (LINUX_VIRTIO_BLOCK || IDE)
+	depends on LINUX_VIRTIO_BLOCK || IDE
 	help 
-	  Includes the symbiotic ram based swap disk
+	  Includes Performance model filter for disk operations
 
 config CGA
 	bool "CGA"
@@ -293,5 +323,6 @@ config TELNET_CONSOLE
 	help
 	  Includes the virtual telnet console 
 
+
 endmenu