Added updated sleep/wakeup functionality

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index ee74ad6..6a4efa7 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -245,6 +245,32 @@ struct guest_info;
        
 
 
+#define V3_Yield()                                     \
+    do {                                               \
+       extern struct v3_os_hooks * os_hooks;           \
+       if ((os_hooks) && (os_hooks)->yield_cpu) {      \
+           (os_hooks)->yield_cpu();                    \
+       }                                               \
+    } while (0)                                                \
+
+
+#define V3_Sleep(usec)                         \
+    do {                                               \
+       extern struct v3_os_hooks * os_hooks;           \
+       if ((os_hooks) && (os_hooks)->sleep_cpu) {\
+           (os_hooks)->sleep_cpu(usec);                \
+       } else {                                        \
+           V3_Yield();                                 \
+        }                                               \
+    }  while (0)                                        \
+
+#define V3_Wakeup(cpu)                                 \
+    do {                                               \
+       extern struct v3_os_hooks * os_hooks;           \
+       if ((os_hooks) && (os_hooks)->wakeup_cpu) {     \
+           (os_hooks)->wakeup_cpu(cpu);                        \
+       }                                               \
+    } while (0)                                                \
 
 
 typedef enum v3_vm_class {V3_INVALID_VM, V3_PC_VM, V3_CRAY_VM} v3_vm_class_t;
@@ -256,8 +282,8 @@ typedef enum v3_cpu_arch {V3_INVALID_CPU, V3_SVM_CPU, V3_SVM_REV3_CPU, V3_VMX_CP
 
 v3_cpu_mode_t v3_get_host_cpu_mode();
 
-void v3_yield(struct guest_info * info);
-void v3_yield_cond(struct guest_info * info);
+void v3_yield(struct guest_info * info, int usec);
+void v3_yield_cond(struct guest_info * info, int usec);
 void v3_print_cond(const char * fmt, ...);
 
 void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
@@ -296,13 +322,16 @@ struct v3_os_hooks {
 
     unsigned int (*get_cpu_khz)(void);
 
-
     void (*yield_cpu)(void); 
+    void (*sleep_cpu)(unsigned int usec);
+    void (*wakeup_cpu)(void *cpu);
 
     void *(*mutex_alloc)(void);
     void (*mutex_free)(void * mutex);
     void (*mutex_lock)(void * mutex, int must_spin);
     void (*mutex_unlock)(void * mutex);
+    void *(*mutex_lock_irqsave)(void * mutex, int must_spin);
+    void (*mutex_unlock_irqrestore)(void * mutex, void *flags);
 
     unsigned int (*get_cpu)(void);
 
@@ -331,7 +360,7 @@ struct v3_interrupt {
 
 
 
-void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+void Init_V3(struct v3_os_hooks * hooks, char * cpus, int num_cpus);
 void Shutdown_V3( void );
 
 
@@ -346,8 +375,12 @@ int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs);
 int v3_save_vm(struct v3_vm_info * vm, char * store, char * url);
 int v3_load_vm(struct v3_vm_info * vm, char * store, char * url);
 
+int v3_send_vm(struct v3_vm_info * vm, char * store, char * url);
+int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url);
+
 int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu);
 
+
 int v3_free_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);