Cleaned up time management stuff, being more careful on signs of various time computa...

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

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 3610f2f..e9b2dc8 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -6,6 +6,13 @@ config APIC
        help 
          Includes the Virtual APIC device
 
+config APIC_ENQUEUE_MISSED_TMR_IRQS
+       bool "Enqueue missed APIC timer interrpts"
+       default n
+       depends on APIC
+       help
+         Make up missed APIC periodic timer interrupts on later 
+         exits into the virtual machine
 
 config DEBUG_APIC
        bool "APIC Debugging"
@@ -14,8 +21,6 @@ config DEBUG_APIC
        help 
          Enable debugging for the APIC
 
-
-
 config IO_APIC
        bool "IOAPIC"
        depends on APIC
@@ -153,10 +158,18 @@ 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
-       depends on PCI
+       depends on PCI && VNET
         help
           Enable the Virtio Net
 
@@ -366,7 +379,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 +415,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 +433,6 @@ config DEBUG_VGA
 config CGA
        bool "CGA"
        default n
-       depends on !PASSTHROUGH_VIDEO
        help
          Includes the Virtual CGA video support
 
@@ -435,14 +447,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 
 
@@ -452,6 +464,13 @@ config SERIAL_UART
        help 
          Include virtual serial port
 
+config DEBUG_SERIAL
+        bool "Debug Serial Port"
+        default n
+        depends on SERIAL_UART
+        help
+          Debugging virtual serial port
+
 config CHAR_STREAM
        bool "Stream based character frontend"
        depends on STREAM
@@ -459,13 +478,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