X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=05510c2a4bc2c7a66a80e95b49a63e7aa47c99bc;hb=506ce8412af316f361b7629a87af6672a87585dd;hp=b10795c80f64a2d41f0f4845ce187a4fc4335758;hpb=655b4ebc21a3dc379539dc603d5524e31ab7b031;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b10795c..05510c2 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -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>
 
@@ -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;						        	\
     })
 
 
@@ -141,13 +153,16 @@ struct guest_info;
 
 #define V3_CREATE_THREAD(fn, arg, name)				\
     do {							\
-	extern struct v3_os_hooks * os_hooks;			\ 
+	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;						\
 	    extern struct v3_os_hooks * os_hooks;			\
@@ -176,6 +191,17 @@ struct guest_info;
     } 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;			\
@@ -199,7 +225,7 @@ struct guest_info;
 	    while(1);							\
 	}								\
     } while(0)								\
-
+	
 
 
 
@@ -228,7 +254,7 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id);
 int v3_vm_enter(struct guest_info * info);
 
 
-#endif //!__V3VEE__
+#endif /*!__V3VEE__ */
 
 
 
@@ -239,7 +265,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);
@@ -249,7 +275,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);
@@ -266,21 +291,21 @@ struct v3_os_hooks {
     unsigned int (*get_cpu)(void);
     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);
 
 };
 
 
-//
-//
-// 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? */
 };
 
 
@@ -289,8 +314,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_stop_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);