X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=cb1bf4cd507e86d216399fe16ab55823249b6654;hb=c0e8207d10b6b077c3fac4fb013ba7485f3a6391;hp=a7f8cbe275b97c9753f662af5a9a4562905b5899;hpb=c866a4f177e15627d31988d5eefa18812bfd5341;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index a7f8cbe..cb1bf4c 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)
 
@@ -212,15 +212,6 @@ struct guest_info;
 	    thread;							\
 	})
 
-#define V3_Reparent_Threadd()					\
-    do {							\
-	extern struct v3_os_hooks * os_hooks;			\
-	if((os_hooks) && (os_hooks)->reparent_threaded) {	\
-	    (os_hooks)->reparent_threaded();			\
-	}							\
-    } while(0)
-
-
 #endif
 
 /* ** */
@@ -279,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);
@@ -304,13 +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);
-    void (*reparent_threadd)(void);
-#endif
+
 };
 
 
@@ -330,11 +320,13 @@ struct v3_interrupt {
 
 
 void Init_V3(struct v3_os_hooks * hooks,  int num_cpus);
+void Deinit_V3();
 
 
-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);