X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=15be9a4c68df4d4c7af718b614907885bd6cca16;hb=e39ac677ad4eb2c2db111ce08eb6172c61f5001f;hp=be4de33792f4f84a5aa40a4229af3861e971a0c5;hpb=a996f792cb40f3451085f9951dd4462d188c84b8;p=palacios-OLD.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index be4de33..15be9a4 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,7 +171,7 @@ 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 for Control VM
 
@@ -169,12 +186,12 @@ config DEBUG_LINUX_VIRTIO_VNET
 config VNET_NIC
         bool "Enable VNET Backend Device"
         default n
-	depends on PCI && EXPERIMENTAL && VNET
+	depends on PCI && VNET
         help
           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"