X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=7222c485dcef66154105ffb1a0d9f61af1465e6b;hb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;hp=0c6f07b221341595188d0aeadc17fe85cb7306c2;hpb=262c92c9f620f87500f350b4744d2f31b6de7da5;p=palacios.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 0c6f07b..7222c48 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -3,7 +3,7 @@ menu "Virtual Devices"
 config APIC
 	bool "APIC" 
 	default y
-	depends on ICC_BUS
+	depends on EXPERIMENTAL
 	help 
 	  Includes the Virtual APIC device
 
@@ -19,7 +19,7 @@ config DEBUG_APIC
 
 config IO_APIC
 	bool "IOAPIC"
-	depends on ICC_BUS
+	depends on EXPERIMENTAL
 	default y
 	help 
 	  Includes the Virtual IO APIC
@@ -32,12 +32,6 @@ config DEBUG_IO_APIC
 	  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"
@@ -159,13 +153,13 @@ config DEBUG_VIRTIO_NET
           Enable debugging for the Linux Virtio Network Device
 
 config VNET_NIC
-        bool "Enable VNET NIC Device"
+        bool "Enable VNET VIrtio NIC Device"
         default n
-	depends on PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL && VNET
         help
-          Enable the VNET NIC backend device
+          Enable the VNET Virtio backend device
 
-config VNET_NIC_NET
+config DEBUG_VNET_NIC
         bool "VNET NIC Device Debugging"
         default n
         depends on VNET_NIC && DEBUG_ON
@@ -187,6 +181,20 @@ config DEBUG_NE2k
 	  Enable debugging for the NE2K
 
 
+config NIC_BRIDGE
+        bool "Enable Direct Bridge to Host network"
+        default n
+        depends on EXPERIMENTAL && PACKET
+        help
+          Enable Host Direct Network Bridge backend device for all network front devices
+
+config DEBUG_NIC_BRIDGE
+        bool "Debugging Direct Bridge to Host network"
+        default n
+        depends on NIC_BRIDGE && DEBUG_ON
+        help
+          Enable Debugging on Host Direct Network Bridge backend device
+
 
 
 
@@ -264,6 +272,18 @@ 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 DEBUG_FILEDISK
+	bool "FILEDISK backend debugging"
+	depends on FILEDISK && DEBUG_ON
+	help 
+	  Enable debugging for the file based disk backend 	
 
 config NETDISK
 	bool "NETDISK storage backend"
@@ -279,6 +299,11 @@ config RAMDISK
 	help 
 	  Includes the RAM based disk backend
 
+config DEBUG_RAMDISK
+	bool "RAMDISK baskend debugging"
+	depends on RAMDISK && DEBUG_ON
+	help 
+	  Enable debugging for the ram based disk backend 	
 
 config TMPDISK
 	bool "TMPDISK storage backend"
@@ -323,5 +348,24 @@ 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
+
+config CHAR_STREAM
+	bool "Stream based character frontend"
+	default n
+	help
+	  Include Stream based character device frontend
+
 endmenu