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

Conflicts:

	palacios/include/palacios/vmm.h
	palacios/src/devices/serial.c

diff --cc palacios/include/palacios/vmm.h
index dad24f6,0d95821..a12d2c1
--- 1/palacios/include/palacios/vmm.h
--- 2/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@@ -202,21 -217,12 +217,16 @@@ struct guest_info
        })
  
  
- #define V3_ACK_IRQ(irq)                                               \
-     do {                                                      \
-       extern struct v3_os_hooks * os_hooks;                   \
-       if ((os_hooks) && (os_hooks)->ack_irq) {                \
-           (os_hooks)->ack_irq(irq);                           \
-       }                                                       \
-     } while (0)
+ #endif
+ 
  
  
 -
 -
 +#define V3_Reparent_Threadd()                                 \
 +    do {                                                      \
 +      if((os_hooks) && (os_hooks)->reparent_threaded) {       \
 +          (os_hooks)->reparent_threaded();                    \
 +      }                                                       \
 +    } while(0)
  
  /* ** */
  

diff --cc palacios/src/palacios/vmm.c
index 00357e7,938105e..f459f6f
--- 1/palacios/src/palacios/vmm.c
--- 2/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@@ -98,9 -98,11 +98,11 @@@ void Init_V3(struct v3_os_hooks * hooks
  
  
  #ifdef CONFIG_VNET
 -    V3_init_vnet();
 +    v3_init_vnet();
  #endif
  
+ 
+ #ifdef CONFIG_MULTITHREAD_OS
      if ((hooks) && (hooks->call_on_cpu)) {
  
        for (i = 0; i < num_cpus; i++) {