X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=9ee2bf898581af07acf1d15912dfda4d0df2cb5b;hb=f762b666f3ea508a49b16429e185eb458aa83329;hp=0d958218682efc2c7bdd38d49e70db379b85e397;hpb=07a12ade201ee7c2fe2358084ca079d2facac500;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 0d95821..9ee2bf8 100644
--- 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 */
 
@@ -90,11 +90,11 @@ struct guest_info;
     })
 
 
-#define V3_FreePage(page)				\
+#define V3_FreePages(page, num_pages)			\
     do {						\
 	extern struct v3_os_hooks * os_hooks;		\
-	if ((os_hooks) && (os_hooks)->free_page) {	\
-	    (os_hooks)->free_page(page);		\
+	if ((os_hooks) && (os_hooks)->free_pages) {	\
+	    (os_hooks)->free_pages(page, num_pages);	\
 	}						\
     } while(0)
 
@@ -193,10 +193,6 @@ struct guest_info;
     } while (0)
 
 
-
-
-
-
 #define V3_Call_On_CPU(cpu, fn, arg)    		\
     do {						\
         extern struct v3_os_hooks * os_hooks;           \
@@ -216,23 +212,23 @@ struct guest_info;
 	    thread;							\
 	})
 
-
 #endif
 
-
-
-
-
-
 /* ** */
 
+
 #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)								\
 	
@@ -274,14 +270,14 @@ struct v3_os_hooks {
     void (*print)(const char * format, ...)
   	__attribute__ ((format (printf, 1, 2)));
   
-    void *(*allocate_pages)(int numPages, unsigned int alignment);
-    void (*free_page)(void * page);
+    void *(*allocate_pages)(int num_pages, unsigned int alignment);
+    void (*free_pages)(void * page, int num_pages);
 
     void *(*malloc)(unsigned int size);
     void (*free)(void * addr);
 
-    void *(*paddr_to_vaddr)(void *addr);
-    void *(*vaddr_to_paddr)(void *addr);
+    void *(*paddr_to_vaddr)(void * addr);
+    void *(*vaddr_to_paddr)(void * addr);
 
     int (*hook_interrupt)(struct v3_vm_info * vm, unsigned int irq);
     int (*ack_irq)(int irq);
@@ -299,12 +295,12 @@ struct v3_os_hooks {
     unsigned int (*get_cpu)(void);
 
 
-#ifdef CONFIG_MULTITHREAD_OS
+
     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);
-#endif
+
 };
 
 
@@ -324,14 +320,15 @@ struct v3_interrupt {
 
 
 void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+void Shutdown_V3( void );
 
 
-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_free_vm(struct v3_vm_info * vm);
 
 int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr);
 
 
-
 #endif