reverted naming changes to fix configuration breakage

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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 262dbed..b5e625e 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 ICC_BUS
        help 
          Includes the Virtual APIC device
 
@@ -15,6 +16,29 @@ 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 BOCHS_DEBUG
        bool "Bochs Debug Console Device"
        default y
@@ -60,20 +84,6 @@ config DEBUG_IDE
          Enable debugging for the IDE Layer
 
 
-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
-
 
 
 
@@ -137,7 +147,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 +158,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"
@@ -263,19 +287,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 +323,6 @@ config TELNET_CONSOLE
        help
          Includes the virtual telnet console 
 
+
 endmenu