Bug fix and cleanup

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

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index c4d0e17..9071fb7 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -65,24 +65,6 @@ int      v3_get_vcore(struct guest_info *);
     })
 
 
-// Use 32 bit constraints if the vm uses 32bit shadow paging at any point
-// Should be used for shadow page tables and any physical memory
-// mapped into the vm
-#define V3_AllocShadowSafePages(vm,num_pages)                          \
-    ({                                                                 \
-       extern struct v3_os_hooks * os_hooks;                           \
-       void * ptr = 0;                                                 \
-       int c; int shadow=0;                                            \
-        for (c=0;c<(vm)->num_cores && !shadow;c++) {                    \
-            shadow|=vm->cores[c].shdw_pg_mode==SHADOW_PAGING;           \
-        }                                                               \
-       if ((os_hooks) && (os_hooks)->allocate_pages) {                 \
-           ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB,-1,\
-                    shadow ? V3_ALLOC_PAGES_CONSTRAINT_4GB : 0);        \
-       }                                                               \
-       ptr;                                                            \
-    })
-
 #define V3_AllocAlignedPages(num_pages, align)                         \
     ({                                                                 \
        extern struct v3_os_hooks * os_hooks;                           \
@@ -210,7 +192,7 @@ int      v3_get_vcore(struct guest_info *);
 
 
 
-#define V3_CREATE_THREAD(fn, arg, name)        ({                              \
+#define V3_CREATE_AND_START_THREAD(fn, arg, name)      ({              \
            void * thread = NULL;                                       \
            extern struct v3_os_hooks * os_hooks;                       \
            if ((os_hooks) && (os_hooks)->start_kernel_thread) {        \
@@ -235,12 +217,27 @@ int      v3_get_vcore(struct guest_info *);
 #define V3_CREATE_THREAD_ON_CPU(cpu, fn, arg, name) ({                 \
            void * thread = NULL;                                       \
            extern struct v3_os_hooks * os_hooks;                       \
-           if ((os_hooks) && (os_hooks)->start_thread_on_cpu) {        \
-               thread = (os_hooks)->start_thread_on_cpu(cpu, fn, arg, name); \
+           if ((os_hooks) && (os_hooks)->create_thread_on_cpu) {       \
+               thread = (os_hooks)->create_thread_on_cpu(cpu, fn, arg, name); \
            }                                                           \
            thread;                                                     \
        })
 
+#define V3_START_THREAD(thread) ({                                     \
+       extern struct v3_os_hooks * os_hooks;                           \
+       if((os_hooks) && (os_hooks)->start_thread){                     \
+           (os_hooks)->start_thread(thread);                           \
+       }                                                               \
+  })
+
+#define V3_CREATE_AND_START_THREAD_ON_CPU(cpu, fn, arg, name) ({        \
+           void *thread = V3_CREATE_THREAD_ON_CPU(cpu,fn,arg,name);    \
+           if (thread) {                                               \
+               V3_START_THREAD(thread);                                \
+            }                                                           \
+            thread;                                                     \
+       })
+
 #define V3_MOVE_THREAD_TO_CPU(pcpu, thread) ({                         \
        int ret = -1;                                                   \
        extern struct v3_os_hooks * os_hooks;                           \
@@ -369,12 +366,11 @@ struct v3_os_hooks {
 
     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);
+    void * (*create_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+    void (*start_thread)(void * core_thread);
     int (*move_thread_to_cpu)(int cpu_id,  void * thread);
 };
 
@@ -422,6 +418,8 @@ struct v3_vm_core_state {
 struct v3_vm_mem_region {
     void               *host_paddr;
     unsigned long long  size;
+    int                 swapped;
+    int                 pinned;
 };
 
 struct v3_vm_mem_state {
@@ -449,6 +447,7 @@ int v3_send_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long l
 int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url, unsigned long long opts);
 
 int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu);
+int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu);
 
 int v3_free_vm(struct v3_vm_info * vm);