Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 1664821..b449d34 100644 (file)
--- 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 EXPERIMENTAL
        help 
          Includes the Virtual APIC device
 
@@ -15,6 +16,23 @@ config DEBUG_APIC
          Enable debugging for the APIC
 
 
+
+config IO_APIC
+       bool "IOAPIC"
+       depends on EXPERIMENTAL
+       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 BOCHS_DEBUG
        bool "Bochs Debug Console Device"
        default y
@@ -60,20 +78,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 +141,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 +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 && VNET
+        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"
@@ -202,7 +221,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
 
@@ -239,6 +258,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"
@@ -254,6 +285,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"
@@ -262,12 +298,26 @@ 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 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 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"
@@ -284,5 +334,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