Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

[palacios.git] / palacios / include / palacios / vmm.h

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 05510c2..620761a 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -34,7 +34,7 @@ struct guest_info;
 #include <palacios/vmm_string.h>
 
 
-//#include <palacios/vmm_paging.h>
+
 
 /* utility definitions */
 
@@ -151,17 +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 @@ 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)
+
+
+
 #define V3_Get_CPU() ({                                                \
             int ret = 0;                                                \
             extern struct v3_os_hooks * os_hooks;                       \
@@ -182,6 +181,18 @@ struct guest_info;
             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;           \
@@ -201,28 +212,27 @@ struct guest_info;
            thread;                                                     \
        })
 
+#endif
 
-#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)
-
-
-
-
+<<<<<<< HEAD:palacios/include/palacios/vmm.h
 
+=======
+>>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
 /* ** */
 
+
 #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)                                                         \
        
@@ -246,7 +256,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);
 
@@ -279,7 +288,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); 
 
@@ -289,6 +297,10 @@ struct v3_os_hooks {
     void (*mutex_unlock)(void * mutex);
 
     unsigned int (*get_cpu)(void);
+
+
+
+    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);
@@ -314,12 +326,11 @@ struct v3_interrupt {
 void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
 
 
-struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name);
 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);
 
 
-
 #endif