X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=d49bb9e96cfe71878af76a07e84538a059c9ce07;hb=fed3449f4fd2fab7f27a17e0970e954bd2d69abc;hp=eb15aca7c6c9e21af6aa18093c3292fc2ff8c9da;hpb=5dcbfcf0f90e52bd1b20551aec1e7f9252025e3d;p=palacios-OLD.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index eb15aca..d49bb9e 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -18,6 +18,7 @@ config DEBUG_APIC
 
 config IO_APIC
 	bool "IOAPIC"
+	depends on APIC
 	default y
 	help 
 	  Includes the Virtual IO APIC
@@ -30,6 +31,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"
@@ -43,7 +51,16 @@ config GENERIC
 	bool "Generic Device"
 	default y
 	help 
-	  Includes the Virtual Generic device
+	  Includes the virtual generic device.  This device allows you
+          to see guest I/O port and memory region interaction with a physical
+          device on the underlying hardware, as well as to ignore such
+          interaction.  The generic device also serves as a front-end
+          device for non-PCI host-based virtual device implementations.  If
+          you want to handle either host-based virtual or physical devices
+          that are not PCI devices, this is what you want.  If you want
+          to handle a host-based virtual device that is a PCI device, you  
+          want to use the PCI front-end device.  If you want to handle
+          a physical PCI device, you want the passthrough PCI device.  
 
 config DEBUG_GENERIC
 	bool "Generic device Debugging"
@@ -139,7 +156,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-	depends on PCI && EXPERIMENTAL
+	depends on PCI
         help
           Enable the Virtio Net
 
@@ -154,9 +171,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"
@@ -167,14 +184,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
@@ -267,6 +284,7 @@ config PASSTHROUGH_PCI
 	help 
 	  Enables hardware devices to be passed through to the VM
 
+
 config DEBUG_PCI
 	bool "PCI debugging"
 	depends on PCI && DEBUG_ON
@@ -274,6 +292,26 @@ config DEBUG_PCI
 	  Enable debugging for the PCI 	
 
 
+config PCI_FRONT
+	bool "PCI front-end device"
+	default y 
+	depends on PCI && HOST_DEVICE
+	help 
+	  PCI front-end device for a host-based PCI device implementation
+          This device allows you to project a host-based *virtual* device 
+          into the guest as a PCI device.   If you want to project a 
+          physical PCI device, use Passthrough PCI instead.  If you want
+          to project a non-PCI virtual or physical device, 
+          use the generic device.
+          
+
+config DEBUG_PCI_FRONT
+	bool "PCI front-end debugging"
+	depends on PCI_FRONT && DEBUG_ON
+	help 
+	  Enable debugging for the PCI front-end device 
+          
+
 
 config PIC
 	bool "8259A PIC"
@@ -364,7 +402,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
@@ -382,7 +420,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -397,14 +434,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 
 
@@ -416,6 +453,7 @@ config SERIAL_UART
 
 config CHAR_STREAM
 	bool "Stream based character frontend"
+	depends on STREAM
 	default n
 	help
 	  Include Stream based character device frontend