X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=ca35565e9ca45bb4430c65283ab9e2e6c746e60c;hb=cbe14745457d9a646157633e1fa8eccffe035953;hp=b80663ace4739c2d326a616cbfb65c7aeaab6027;hpb=a80196a40e35de0efc20efb3e9466d348d5fd28c;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index b80663a..ca35565 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -70,6 +70,12 @@ struct v3_core_move_cmd {
 struct v3_chkpt_info {
     char store[128];
     char url[256]; /* This might need to be bigger... */
+    unsigned long long opts;
+#define V3_CHKPT_OPT_NONE         0
+#define V3_CHKPT_OPT_SKIP_MEM     1  // don't write memory to store
+#define V3_CHKPT_OPT_SKIP_DEVS    2  // don't write devices to store
+#define V3_CHKPT_OPT_SKIP_CORES   4  // don't write core arch ind data to store
+#define V3_CHKPT_OPT_SKIP_ARCHDEP 8  // don't write core arch dep data to store
 } __attribute__((packed));
 
 
@@ -114,7 +120,7 @@ struct v3_guest {
 
 
 
-int palacios_vmm_init( void );
+int palacios_vmm_init( char *options );
 int palacios_vmm_exit( void );
 
 
@@ -123,12 +129,15 @@ struct proc_dir_entry *palacios_get_procdir(void);
 
 // Selected exported stubs, for use in other palacios components, like vnet
 // The idea is that everything uses the same stubs
-void  palacios_print(const char *fmt, ...);
+void  palacios_print_scoped(void *vm, int vcore, const char *fmt, ...);
+#define palacios_print(...) palacios_print_scoped(0,-1, __VA_ARGS__)
 void *palacios_allocate_pages(int num_pages, unsigned int alignment);
 void  palacios_free_pages(void *page_addr, int num_pages);
 void *palacios_alloc(unsigned int size);
 void *palacios_alloc_extended(unsigned int size, unsigned int flags);
 void  palacios_free(void *);
+void *palacios_valloc(unsigned int size); // use instead of vmalloc
+void  palacios_vfree(void *);             // use instead of vfree
 void *palacios_vaddr_to_paddr(void *vaddr);
 void *palacios_paddr_to_vaddr(void *paddr);
 void *palacios_start_kernel_thread(int (*fn)(void * arg), void *arg, char *thread_name);
@@ -138,13 +147,23 @@ void  palacios_yield_cpu(void);
 void  palacios_yield_cpu_timed(unsigned int us);
 unsigned int palacios_get_cpu(void);
 unsigned int palacios_get_cpu_khz(void);
-void *palacios_mutex_alloc(void);
-void  palacios_mutex_free(void *mutex);
+void *palacios_mutex_alloc(void);         // allocates and inits a lock
+void  palacios_mutex_init(void *mutex);   // only inits a lock
+void  palacios_mutex_deinit(void *mutex); // only deinits a lock
+void  palacios_mutex_free(void *mutex);   // deinits and frees a lock
 void  palacios_mutex_lock(void *mutex, int must_spin);
 void  palacios_mutex_unlock(void *mutex);
 void *palacios_mutex_lock_irqsave(void *mutex, int must_spin);
 void  palacios_mutex_unlock_irqrestore(void *mutex, void *flags);
-
+// Macros for spin-locks in the module code
+// By using these macros, the lock checker will be able
+// to see the module code as well as the core VMM
+#define palacios_spinlock_init(l) palacios_mutex_init(l)
+#define palacios_spinlock_deinit(l) palacios_mutex_deinit(l)
+#define palacios_spinlock_lock(l) palacios_mutex_lock(l,0)
+#define palacios_spinlock_unlock(l) palacios_mutex_unlock(l)
+#define palacios_spinlock_lock_irqsave(l,f) do { f=(unsigned long)palacios_mutex_lock_irqsave(l,0); } while (0)
+#define palacios_spinlock_unlock_irqrestore(l,f) palacios_mutex_unlock_irqrestore(l,(void*)f)
 
 
 // Palacios Printing Support