X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=dad24f6be7a81e2654149ef31db9085f40796dae;hb=09a7d3811df9df65346e36419f553a38c8c45c72;hp=f24b8e3718cb919a8e7855df2b540a1721bf0328;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index f24b8e3..dad24f6 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -67,14 +67,26 @@ struct guest_info;
 
 
 
-#define V3_AllocPages(num_pages)				\
-    ({								\
-	extern struct v3_os_hooks * os_hooks;			\
-	void * ptr = 0;						\
-	if ((os_hooks) && (os_hooks)->allocate_pages) {		\
-	    ptr = (os_hooks)->allocate_pages(num_pages);	\
-	}							\
-	ptr;							\
+/* 4KB-aligned */
+#define V3_AllocPages(num_pages)			        	\
+    ({							        	\
+	extern struct v3_os_hooks * os_hooks;		        	\
+	void * ptr = 0;					        	\
+	if ((os_hooks) && (os_hooks)->allocate_pages) {	        	\
+	    ptr = (os_hooks)->allocate_pages(num_pages,PAGE_SIZE_4KB);	\
+	}						        	\
+	ptr;						        	\
+    })
+
+
+#define V3_AllocAlignedPages(num_pages, align)		        	\
+    ({							        	\
+	extern struct v3_os_hooks * os_hooks;		        	\
+	void * ptr = 0;					        	\
+	if ((os_hooks) && (os_hooks)->allocate_pages) {	        	\
+	    ptr = (os_hooks)->allocate_pages(num_pages,align);  	\
+	}						        	\
+	ptr;						        	\
     })
 
 
@@ -148,6 +160,9 @@ struct guest_info;
     } while (0)
 
 
+
+
+
 #define V3_Hook_Interrupt(vm, irq) ({					\
 	    int ret = 0;						\
 	    extern struct v3_os_hooks * os_hooks;			\
@@ -158,6 +173,35 @@ struct guest_info;
 	})								\
 	
 
+#define V3_Get_CPU() ({  				                \
+            int ret = 0;                                                \
+            extern struct v3_os_hooks * os_hooks;                       \
+            if ((os_hooks) && (os_hooks)->get_cpu) {                    \
+                ret = (os_hooks)->get_cpu();                            \
+            }                                                           \
+            ret;                                                        \
+        })
+
+#define V3_Call_On_CPU(cpu, fn, arg)    		\
+    do {						\
+        extern struct v3_os_hooks * os_hooks;           \
+        if ((os_hooks) && (os_hooks)->call_on_cpu) {    \
+            (os_hooks)->call_on_cpu(cpu, fn, arg);      \
+        }                                               \
+    } while (0)
+
+
+
+#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); \
+	    }								\
+	    thread;							\
+	})
+
+
 #define V3_ACK_IRQ(irq)						\
     do {							\
 	extern struct v3_os_hooks * os_hooks;			\
@@ -167,18 +211,27 @@ struct guest_info;
     } while (0)
 
 
-
-
+#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)								\
 	
@@ -200,7 +253,7 @@ void v3_yield_cond(struct guest_info * info);
 void v3_print_cond(const char * fmt, ...);
 
 
-void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu);
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector);
 
 unsigned int v3_get_cpu_id();
 
@@ -221,7 +274,7 @@ struct v3_os_hooks {
     void (*print)(const char * format, ...)
   	__attribute__ ((format (printf, 1, 2)));
   
-    void *(*allocate_pages)(int numPages);
+    void *(*allocate_pages)(int numPages, unsigned int alignment);
     void (*free_page)(void * page);
 
     void *(*malloc)(unsigned int size);
@@ -231,7 +284,6 @@ struct v3_os_hooks {
     void *(*vaddr_to_paddr)(void *addr);
 
     int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq);
-
     int (*ack_irq)(int irq);
 
     unsigned int (*get_cpu_khz)(void);
@@ -246,17 +298,13 @@ struct v3_os_hooks {
     void (*mutex_unlock)(void * mutex);
 
     unsigned int (*get_cpu)(void);
-    void (*interrupt_cpu)(struct v3_vm_info * vm, int logical_cpu);
+    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 logical_cpu, int (*fn)(void * arg), void * arg, char * thread_name);
+    void * (*start_thread_on_cpu)(int cpu_id, int (*fn)(void * arg), void * arg, char * thread_name);
+    void (*reparent_threadd)(void);
 };
 
 
-
-
-
-
-
 //
 //
 // This is the interrupt state that the VMM's interrupt handlers need to see
@@ -275,8 +323,9 @@ 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);
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask);
-struct v3_vm_info * v3_create_vm(void * cfg);
+
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);