Fix to VMM/Guest model dynamic switch for Virtio NIC

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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 685b245..eb15aca 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -3,7 +3,6 @@ menu "Virtual Devices"
 config APIC
        bool "APIC" 
        default y
-       depends on EXPERIMENTAL
        help 
          Includes the Virtual APIC device
 
@@ -19,7 +18,6 @@ config DEBUG_APIC
 
 config IO_APIC
        bool "IOAPIC"
-       depends on EXPERIMENTAL
        default y
        help 
          Includes the Virtual IO APIC
@@ -152,10 +150,26 @@ config DEBUG_VIRTIO_NET
         help
           Enable debugging for the Linux Virtio Network Device
 
+
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET
+        help
+          Enable the Virtio VNET interface
+
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "Virtio VNET Interface Debugging"
+        default n
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
+        help
+          Enable debugging for the VNET Virtio interface
+
+
 config VNET_NIC
         bool "Enable VNET VIrtio NIC Device"
         default n
-       depends on PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL && VNET
         help
           Enable the VNET Virtio backend device
 
@@ -174,12 +188,40 @@ config NE2K
        help
          Includes the Virtual NE2K network card
 
-config DEBUG_NE2k
+config DEBUG_NE2K
        bool "NE2K debugging"
-       depends on NE2k && DEBUG_ON
+       default n
+       depends on NE2K && DEBUG_ON
        help 
          Enable debugging for the NE2K
 
+config RTL8139
+        bool "RTL8139"
+        depends on EXPERIMENTAL
+        default n
+        help
+          Includes the Virtual RTL8139 network card
+
+config DEBUG_RTL8139
+        bool "RTL8139 debugging"
+        default n
+        depends on RTL8139 && DEBUG_ON
+        help
+          Enable debugging for the RTL8139
+
+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
 
 
 
@@ -319,6 +361,24 @@ config DISK_MODEL
        help 
          Includes Performance model filter for disk operations
 
+config VGA
+       bool "VGA"
+       default n
+       depends on !PASSTHROUGH_VIDEO && GRAPHICS_CONSOLE
+       help
+         Includes the Virtual VGA video support, and will 
+          eventually also include SVGA
+          Host frame buffer support (GRAPHICS_CONSOLE) is needed
+          for the hostframebuf option to work
+
+
+config DEBUG_VGA
+       bool "DEBUG_VGA"
+       default n
+       depends on VGA
+       help
+         Enables debugging output for the VGA device 
+
 config CGA
        bool "CGA"
        default n
@@ -327,6 +387,13 @@ config CGA
          Includes the Virtual CGA video support
 
 
+config DEBUG_CGA
+       int "DEBUG_CGA"
+       default 0
+       depends on CGA
+       help
+         Enables Debugging for the CGA device (2 = Verbose, 1 = Debug, 0 = Off)
+
 config TELNET_CONSOLE
        bool "Telnet Virtual Console"
        default n
@@ -353,5 +420,13 @@ config CHAR_STREAM
        help
          Include Stream based character device frontend
 
+
+config MCHECK
+       bool "Machine Check architecture"
+       default n
+       depends on EXPERIMENTAL
+       help 
+         Include Machine Check injection architecture
+
 endmenu