add dependency of virtio nic with vnet

[palacios.git] / palacios / src / devices / Kconfig

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 873792d..cf45c27 100644 (file)
--- 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 && VNET
         help
           Enable the Virtio Net
 
@@ -150,15 +167,31 @@ 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 && 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 && 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
@@ -251,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
@@ -258,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"
@@ -345,6 +399,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
@@ -382,6 +454,7 @@ config SERIAL_UART
 
 config CHAR_STREAM
        bool "Stream based character frontend"
+       depends on STREAM
        default n
        help
          Include Stream based character device frontend