Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / palacios / src / devices / Kconfig

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 55b6b1e..456d717 100644 (file)
--- 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"
@@ -147,7 +141,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
 
@@ -158,6 +152,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"
@@ -250,6 +258,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"
@@ -309,5 +324,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 STREAM
+       bool "Stream device"
+       default n
+       help
+         Stream Device
+
 endmenu