Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

Conflicts:

	palacios/src/palacios/vmm.c

diff --combined palacios/src/devices/Kconfig
index 8d62f77,7185263..456d717
--- 1/palacios/src/devices/Kconfig
--- 2/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@@ -3,7 -3,7 +3,7 @@@ menu "Virtual Devices
  config APIC
        bool "APIC" 
        default y
-       depends on ICC_BUS && EXPERIMENTAL
+       depends on EXPERIMENTAL
        help 
          Includes the Virtual APIC device
  
@@@ -19,7 -19,7 +19,7 @@@ config DEBUG_API
  
  config IO_APIC
        bool "IOAPIC"
-       depends on ICC_BUS && EXPERIMENTAL
+       depends on EXPERIMENTAL
        default y
        help 
          Includes the Virtual IO APIC
@@@ -32,20 -32,6 +32,6 @@@ config DEBUG_IO_API
          Enable debugging for the IO APIC
  
  
- config ICC_BUS
-       bool "ICC BUS"
-       default y
-       depends on EXPERIMENTAL
-       help 
-         The ICC Bus for APIC/IOAPIC communication
- 
- config DEBUG_ICC_BUS
-       bool "ICC BUS Debugging"
-       default n
-       depends on ICC_BUS && DEBUG_ON
-       help
-         Enable debugging for the ICC BUS
- 
  
  config BOCHS_DEBUG
        bool "Bochs Debug Console Device"
@@@ -351,11 -337,5 +337,11 @@@ config SERIAL_UAR
        help 
          Include virtual serial port
  
 +config STREAM
 +      bool "Stream device"
 +      default n
 +      help
 +        Stream Device
 +
  endmenu
  

diff --combined palacios/src/devices/Makefile
index a90ac91,7ed99be..434caee
--- 1/palacios/src/devices/Makefile
--- 2/palacios/src/devices/Makefile
+++ b/palacios/src/devices/Makefile
@@@ -1,6 -1,5 +1,5 @@@
  obj-$(CONFIG_APIC) += apic.o
  obj-$(CONFIG_IO_APIC) += io_apic.o
- obj-$(CONFIG_ICC_BUS) += icc_bus.o
  obj-$(CONFIG_PIT) += 8254.o
  obj-$(CONFIG_PIC) += 8259a.o
  obj-$(CONFIG_BOCHS_DEBUG) += bochs_debug.o
@@@ -38,4 -37,4 +37,4 @@@ obj-$(CONFIG_CURSES_CONSOLE) += curses_
  obj-$(CONFIG_PASSTHROUGH_PCI) += pci_passthrough.o
  
  obj-$(CONFIG_SYMMOD) += lnx_virtio_symmod.o
 -
 +obj-$(CONFIG_STREAM) += stream.o