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 9a07e71..7bcc256 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 ICC_BUS && 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 ICC_BUS && EXPERIMENTAL
        default y
        help 
          Includes the Virtual IO APIC
@@ -35,6 +35,7 @@ config DEBUG_IO_APIC
 config ICC_BUS
        bool "ICC BUS"
        default y
+       depends on EXPERIMENTAL
        help 
          The ICC Bus for APIC/IOAPIC communication
 
@@ -271,6 +272,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"