added virtio console, finished the stream interface implementation, added v3_stream...

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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index cf45c27..758f2bd 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -153,6 +153,14 @@ config DEBUG_VIRTIO_SYM
        help 
          Enable debugging for the Linux Virtio Symbiotic Device
 
+config LINUX_VIRTIO_CONSOLE
+        bool "Enable Virtio Console Device"
+        default n
+       depends on PCI
+        help
+          Enable the Virtio Console
+
+
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
@@ -366,7 +374,7 @@ config RAMDISK
          Includes the RAM based disk backend
 
 config DEBUG_RAMDISK
-       bool "RAMDISK baskend debugging"
+       bool "RAMDISK backend debugging"
        depends on RAMDISK && DEBUG_ON
        help 
          Enable debugging for the ram based disk backend       
@@ -402,7 +410,7 @@ config DISK_MODEL
 config VGA
        bool "VGA"
        default n
-       depends on !PASSTHROUGH_VIDEO && GRAPHICS_CONSOLE
+       depends GRAPHICS_CONSOLE
        help
          Includes the Virtual VGA video support, and will 
           eventually also include SVGA
@@ -420,7 +428,6 @@ config DEBUG_VGA
 config CGA
        bool "CGA"
        default n
-       depends on !PASSTHROUGH_VIDEO
        help
          Includes the Virtual CGA video support
 
@@ -435,14 +442,14 @@ config DEBUG_CGA
 config TELNET_CONSOLE
        bool "Telnet Virtual Console"
        default n
-       depends on CGA && !PASSTHROUGH_VIDEO
+       depends on CGA
        help
          Includes the virtual telnet console 
 
 config CURSES_CONSOLE
        bool "Curses Virtual Console"
        default n
-       depends on CGA && !PASSTHROUGH_VIDEO
+       depends on CGA && CONSOLE
        help
          Includes the virtual curses console 
 
@@ -459,13 +466,5 @@ 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