X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=e9b2dc8a1450efc2f0413222ad8b799dee443a77;hb=8a3dbb70c29175bad79764a0b2f3961b98138bb2;hp=c2728b3f1bd50a954a3df3221ec58342141f35b4;hpb=dbace2679a283baec34858e25c59d33eadcbb10b;p=palacios.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index c2728b3..e9b2dc8 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,10 +21,9 @@ config DEBUG_APIC
 	help 
 	  Enable debugging for the APIC
 
-
-
 config IO_APIC
 	bool "IOAPIC"
+	depends on APIC
 	default y
 	help 
 	  Includes the Virtual IO APIC
@@ -30,6 +36,13 @@ config DEBUG_IO_APIC
 	  Enable debugging for the IO APIC
 
 
+config MPTABLE
+	bool "MPTABLE"
+	default y
+	depends on APIC
+	help 
+	  Includes the MPTABLE to map the APICs and IO-APIC
+
 
 config BOCHS_DEBUG
 	bool "Bochs Debug Console Device"
@@ -145,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 && EXPERIMENTAL
+	depends on PCI && VNET
         help
           Enable the Virtio Net
 
@@ -163,9 +184,9 @@ config DEBUG_VIRTIO_NET
 config LINUX_VIRTIO_VNET
         bool "Enable Virtio VNET interface"
         default n
-        depends on PCI && EXPERIMENTAL && VNET
+        depends on PCI && VNET
         help
-          Enable the Virtio VNET interface
+          Enable the Virtio VNET interface for Control VM
 
 config DEBUG_LINUX_VIRTIO_VNET
         bool "Virtio VNET Interface Debugging"
@@ -176,14 +197,14 @@ config DEBUG_LINUX_VIRTIO_VNET
 
 
 config VNET_NIC
-        bool "Enable VNET VIrtio NIC Device"
+        bool "Enable VNET Backend Device"
         default n
-	depends on PCI && EXPERIMENTAL && VNET
+	depends on PCI && VNET
         help
-          Enable the VNET Virtio backend device
+          Enable the VNET backend device
 
 config DEBUG_VNET_NIC
-        bool "VNET NIC Device Debugging"
+        bool "VNET Backend Device Debugging"
         default n
         depends on VNET_NIC && DEBUG_ON
         help
@@ -358,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 	
@@ -394,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
@@ -412,7 +433,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -427,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 
 
@@ -444,19 +464,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