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

Conflicts:

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

diff --combined 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
@@@ -21,7 -21,7 +21,7 @@@
  #define __VMM_H__
  
  
- //#include <palacios/vm_guest.h>
+ /*#include <palacios/vm_guest.h>*/
  #include <palacios/vmm_mem.h>
  #include <palacios/vmm_types.h>
  
@@@ -151,17 -151,6 +151,6 @@@ struct guest_info
        
  
  
- #define V3_CREATE_THREAD(fn, arg, name)                               \
-     do {                                                      \
-       extern struct v3_os_hooks * os_hooks;                   \
-       if ((os_hooks) && (os_hooks)->start_kernel_thread) {    \
-           (os_hooks)->start_kernel_thread(fn, arg, name);     \
-       }                                                       \
-     } while (0)
- 
- 
- 
- 
  
  #define V3_Hook_Interrupt(vm, irq) ({                                 \
            int ret = 0;                                                \
@@@ -173,6 -162,16 +162,16 @@@
        })                                                              \
        
  
+ #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)
+ 
+ 
+ 
  #define V3_Get_CPU() ({                                               \
              int ret = 0;                                                \
              extern struct v3_os_hooks * os_hooks;                       \
@@@ -182,6 -181,22 +181,22 @@@
              ret;                                                        \
          })
  
+ 
+ #ifdef CONFIG_MULTITHREAD_OS
+ 
+ #define V3_CREATE_THREAD(fn, arg, name)                               \
+     do {                                                      \
+       extern struct v3_os_hooks * os_hooks;                   \
+       if ((os_hooks) && (os_hooks)->start_kernel_thread) {    \
+           (os_hooks)->start_kernel_thread(fn, arg, name);     \
+       }                                                       \
+     } while (0)
+ 
+ 
+ 
+ 
+ 
+ 
  #define V3_Call_On_CPU(cpu, fn, arg)                  \
      do {                                              \
          extern struct v3_os_hooks * os_hooks;           \
@@@ -202,36 -217,22 +217,31 @@@
        })
  
  
- #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)
  
  /* ** */
  
  #define V3_ASSERT(x)                                                  \
      do {                                                              \
 +      extern struct v3_os_hooks * os_hooks;                           \
        if (!(x)) {                                                     \
            PrintDebug("Failed assertion in %s: %s at %s, line %d, RA=%lx\n", \
                       __func__, #x, __FILE__, __LINE__,                \
                       (ulong_t) __builtin_return_address(0));          \
 -          while(1);                                                   \
 +          while(1){                                                   \
 +              if ((os_hooks) && (os_hooks)->yield_cpu) {              \
 +                      (os_hooks)->yield_cpu();                        \
 +              }                                                       \
 +          }                                                           \
        }                                                               \
      } while(0)                                                                \
        
@@@ -255,7 -256,6 +265,6 @@@ void v3_print_cond(const char * fmt, ..
  
  void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
  
- unsigned int v3_get_cpu_id();
  
  v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
  
@@@ -263,7 -263,7 +272,7 @@@
  int v3_vm_enter(struct guest_info * info);
  
  
- #endif //!__V3VEE__
+ #endif /*!__V3VEE__ */
  
  
  
@@@ -288,7 -288,6 +297,6 @@@ struct v3_os_hooks 
  
      unsigned int (*get_cpu_khz)(void);
  
-     void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
  
      void (*yield_cpu)(void); 
  
@@@ -298,23 -297,27 +306,27 @@@
      void (*mutex_unlock)(void * mutex);
  
      unsigned int (*get_cpu)(void);
+ 
+ 
+ #ifdef CONFIG_MULTITHREAD_OS
+     void (*start_kernel_thread)(int (*fn)(void * arg), void * arg, char * thread_name); 
      void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu, int vector);
      void (*call_on_cpu)(int logical_cpu, void (*fn)(void * arg), void * arg);
      void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
 -#endif
 +    void (*reparent_threadd)(void);
  };
  
  
- //
- //
- // This is the interrupt state that the VMM's interrupt handlers need to see
- //
+ /*
+  *
+  * This is the interrupt state that the VMM's interrupt handlers need to see
+  */
  struct v3_interrupt {
      unsigned int irq;
      unsigned int error;
  
-     unsigned int should_ack;  // Should the vmm ack this interrupt, or will
-     // the host OS do it?
+     unsigned int should_ack;  /* Should the vmm ack this interrupt, or will
+                              * the host OS do it? */
  };
  
  
@@@ -325,7 -328,7 +337,7 @@@ void Init_V3(struct v3_os_hooks * hooks
  
  struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data);
  int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
- 
+ int v3_stop_vm(struct v3_vm_info * vm);
  
  int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);
  

diff --combined 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++) {
@@@ -109,6 -111,10 +111,10 @@@
            hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
        }
      }
+ #else 
+     init_cpu(0);
+ #endif
+ 
  }
  
  
@@@ -164,11 -170,12 +170,12 @@@ static int start_core(void * p
      return 0;
  }
  
- 
+ #ifdef CONFIG_MULTITHREAD_OS
  // For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
  #define MAX_CORES 32
  
- int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+ 
+ static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) {
      uint32_t i;
      char tname[16];
      int vcore_id = 0;
@@@ -232,6 -239,31 +239,31 @@@
      return 0;
  
  }
+ #endif
+ 
+ 
+ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
+ #ifdef CONFIG_MULTITHREAD_OS
+     return start_vm_multicore(vm, cpu_mask);
+ #else 
+     return start_core(&(vm->cores[0]));
+ #endif
+ }
+ 
+ 
+ int v3_stop_vm(struct v3_vm_info * vm) {
+ 
+     vm->run_state = VM_STOPPED;
+ 
+ 
+     // force exit all cores via a cross call/IPI
+ 
+     // Wait for all cores to enter CORE_STOPPED state
+ 
+     // deinitialize guest (free memory, etc...)
+ 
+     return 0;
+ }
  
  
  #ifdef __V3_32BIT__
@@@ -320,7 -352,7 +352,7 @@@ void v3_print_cond(const char * fmt, ..
  }
  
  
- 
+ #ifdef CONFIG_MULTITHREAD_OS
  
  void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
      extern struct v3_os_hooks * os_hooks;
@@@ -329,19 -361,7 +361,7 @@@
        (os_hooks)->interrupt_cpu(vm, logical_cpu, vector);
      }
  }
- 
- 
- 
- unsigned int v3_get_cpu_id() {
-     extern struct v3_os_hooks * os_hooks;
-     unsigned int ret = (unsigned int)-1;
- 
-     if ((os_hooks) && (os_hooks)->get_cpu) {
-       ret = os_hooks->get_cpu();
-     }
- 
-     return ret;
- }
+ #endif