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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index dbce08b..0edc9ff 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,36 @@ 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 DEBUG_ICC_BUS
+	bool "ICC BUS Debugging"
+	default n
+	depends on ICC_BUS && DEBUG_ON
+	help
+	  Enable debugging for the ICC BUS
+
+
 config BOCHS_DEBUG
 	bool "Bochs Debug Console Device"
 	default y
@@ -60,20 +91,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,7 +154,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
 
@@ -148,6 +165,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"
@@ -203,7 +234,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
 
@@ -240,6 +271,13 @@ config DEBUG_PIT
 	help 
 	  Enable debugging for the PIT	
 
+config FILEDISK
+	bool "FILEDISK storage backend"
+	default y
+	depends on FILE && (IDE || LINUX_VIRTIO_BLOCK)
+	help
+	  Includes the file based disk backend
+
 
 config NETDISK
 	bool "NETDISK storage backend"
@@ -263,19 +301,19 @@ 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 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 SYM_SWAP2
-	bool "Symbiotic Swap disk v2"
+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"
@@ -299,5 +337,18 @@ config TELNET_CONSOLE
 	help
 	  Includes the virtual telnet console 
 
+config CURSES_CONSOLE
+	bool "Curses Virtual Console"
+	default n
+	depends on CGA && !PASSTHROUGH_VIDEO
+	help
+	  Includes the virtual curses console 
+
+config SERIAL_UART
+	bool "Serial Port"
+	default y
+	help 
+	  Include virtual serial port
+
 endmenu