X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=9748c1f78d7488461c5e978d27ece4fda93590df;hb=c3498e95bc8a73f4888d42166561f377af20ee5b;hp=15be9a4c68df4d4c7af718b614907885bd6cca16;hpb=6774bce4f94af0884dcaf9e13075068e19dd845d;p=palacios.releases.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 15be9a4..9748c1f 100644
--- 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
 
@@ -183,6 +196,7 @@ config DEBUG_LINUX_VIRTIO_VNET
           Enable debugging for the VNET Virtio interface
 
 
+
 config VNET_NIC
         bool "Enable VNET Backend Device"
         default n
@@ -197,6 +211,20 @@ config DEBUG_VNET_NIC
         help
           Enable debugging for the VNET NIC Device
 
+config VNET_GUEST_IFACE
+        bool "Enable VNET guest hypercall interface"
+        default n
+        depends on VNET
+        help
+          Allows the guest to query for info, such as headers, from VNET
+
+config DEBUG_VNET_GUEST_IFACE
+        bool "VNET guest hypercall interface debugging"
+        default n
+        depends on VNET_GUEST_IFACE && DEBUG_ON
+        help
+          Enable debugging for the VNET guest hypercall interface
+
 
 config NE2K
 	bool "NE2K"
@@ -366,7 +394,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 +430,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 +448,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -435,14 +462,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,19 +479,19 @@ 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
 	default n
 	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