X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=a5847ef009b23c2c54d802e53cb4b6ad7a916dcf;hb=e1dcef8166cab60ca0304121ddd176760af0d3d6;hp=6f63f23b0628dd392f872897cfac5328c32ec955;hpb=b54cbe1dbbe15ed228de7472ea284df96ecce909;p=palacios.releases.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 6f63f23..a5847ef 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,19 @@ 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
+        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
@@ -150,19 +173,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
@@ -199,6 +210,13 @@ config PCI
 	help
 	  Includes the Virtual PCI Bus
 
+config PASSTHROUGH_PCI
+	bool "Passthrough PCI"
+	default y 
+	depends on PCI && EXPERIMENTAL && SYMBIOTIC
+	help 
+	  Enables hardware devices to be passed through to the VM
+
 config DEBUG_PCI
 	bool "PCI debugging"
 	depends on PCI && DEBUG_ON
@@ -233,24 +251,27 @@ config DEBUG_PIT
 	  Enable debugging for the PIT	
 
 
-
-
-config RAM_CD
-	bool "RAM based CD backend"
+config NETDISK
+	bool "NETDISK storage backend"
 	default y
-	depends on IDE || LINUX_VIRTIO_BLOCK
+	depends on SOCKET && (IDE || LINUX_VIRTIO_BLOCK)
 	help 
-	  Includes the RAM based CD backend
+	  Includes the Network based disk backend
 
-config RAM_HD
-	bool "RAM based HD backend"
+config RAMDISK
+	bool "RAMDISK storage backend"
 	default y
 	depends on IDE || LINUX_VIRTIO_BLOCK
 	help 
-	  Includes the RAM based HD backend
-
+	  Includes the RAM based disk backend
 
 
+config TMPDISK
+	bool "TMPDISK storage backend"
+	default y
+	depends on IDE || LINUX_VIRTIO_BLOCK
+	help 
+	  Includes the temporary RAM disk 
 
 config SYM_SWAP
 	bool "Symbiotic Swap disk"
@@ -259,6 +280,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