X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=35b85237f0158b0500be70d6393e13dc4e4e033e;hb=38482d86320b405b91ec00db15f1bcaa8031fd3a;hp=685b24586a24723718607589957a377d9fbe9ee1;hpb=39b4fae9c539fbd848edd786500e60aae17b84a0;p=palacios.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 685b245..35b8523 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -3,7 +3,6 @@ menu "Virtual Devices"
 config APIC
 	bool "APIC" 
 	default y
-	depends on EXPERIMENTAL
 	help 
 	  Includes the Virtual APIC device
 
@@ -19,7 +18,6 @@ config DEBUG_APIC
 
 config IO_APIC
 	bool "IOAPIC"
-	depends on EXPERIMENTAL
 	default y
 	help 
 	  Includes the Virtual IO APIC
@@ -45,7 +43,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"
@@ -152,12 +159,28 @@ config DEBUG_VIRTIO_NET
         help
           Enable debugging for the Linux Virtio Network Device
 
+
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET
+        help
+          Enable the Virtio VNET interface for Control VM
+
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "Virtio VNET Interface Debugging"
+        default n
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
+        help
+          Enable debugging for the VNET Virtio interface
+
+
 config VNET_NIC
-        bool "Enable VNET VIrtio NIC Device"
+        bool "Enable VNET Backend Device"
         default n
-	depends on PCI && EXPERIMENTAL
+	depends on PCI && EXPERIMENTAL && VNET
         help
-          Enable the VNET Virtio backend device
+          Enable the VNET backend device
 
 config DEBUG_VNET_NIC
         bool "VNET NIC Device Debugging"
@@ -174,12 +197,40 @@ config NE2K
 	help
 	  Includes the Virtual NE2K network card
 
-config DEBUG_NE2k
+config DEBUG_NE2K
 	bool "NE2K debugging"
-	depends on NE2k && DEBUG_ON
+	default n
+	depends on NE2K && DEBUG_ON
 	help 
 	  Enable debugging for the NE2K
 
+config RTL8139
+        bool "RTL8139"
+        depends on EXPERIMENTAL
+        default n
+        help
+          Includes the Virtual RTL8139 network card
+
+config DEBUG_RTL8139
+        bool "RTL8139 debugging"
+        default n
+        depends on RTL8139 && DEBUG_ON
+        help
+          Enable debugging for the RTL8139
+
+config NIC_BRIDGE
+        bool "Enable Direct Bridge to Host network"
+        default n
+        depends on EXPERIMENTAL && PACKET
+        help
+          Enable Host Direct Network Bridge backend device for all network front devices
+
+config DEBUG_NIC_BRIDGE
+        bool "Debugging Direct Bridge to Host network"
+        default n
+        depends on NIC_BRIDGE && DEBUG_ON
+        help
+          Enable Debugging on Host Direct Network Bridge backend device
 
 
 
@@ -225,6 +276,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
@@ -232,6 +284,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"
@@ -319,6 +391,24 @@ config DISK_MODEL
 	help 
 	  Includes Performance model filter for disk operations
 
+config VGA
+	bool "VGA"
+	default n
+	depends on !PASSTHROUGH_VIDEO && GRAPHICS_CONSOLE
+	help
+	  Includes the Virtual VGA video support, and will 
+          eventually also include SVGA
+          Host frame buffer support (GRAPHICS_CONSOLE) is needed
+          for the hostframebuf option to work
+
+
+config DEBUG_VGA
+	bool "DEBUG_VGA"
+	default n
+	depends on VGA
+	help
+	  Enables debugging output for the VGA device 
+
 config CGA
 	bool "CGA"
 	default n
@@ -327,6 +417,13 @@ config CGA
 	  Includes the Virtual CGA video support
 
 
+config DEBUG_CGA
+	int "DEBUG_CGA"
+	default 0
+	depends on CGA
+	help
+	  Enables Debugging for the CGA device (2 = Verbose, 1 = Debug, 0 = Off)
+
 config TELNET_CONSOLE
 	bool "Telnet Virtual Console"
 	default n
@@ -353,5 +450,13 @@ 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