X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=fc406bfa00bc513a5a457bd592985c84f2c52ccb;hb=c8b23e99efde3aa5a2c26d1b8e9bc7dc914e6113;hp=63d948fd2e260aff9c03e4213d2477cf668031f6;hpb=ccbe7e2ab17a32e671114f258abc1d047151be2e;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 63d948f..fc406bf 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -5,6 +5,7 @@
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/version.h>
 
 
 /* Global Control IOCTLs */
@@ -152,7 +153,7 @@ struct v3_guest {
 // For now MAX_VMS must be a multiple of 8
 // This is due to the minor number bitmap
 #define MAX_VMS 32
-
+#define MAX_THREADS (MAX_VMS*64)
 
 
 int palacios_vmm_init( char *options );
@@ -162,6 +163,8 @@ int palacios_vmm_exit( void );
 // This is how a component finds the proc dir we are using for global state
 struct proc_dir_entry *palacios_get_procdir(void);
 
+struct v3_resource_control;
+
 // Selected exported stubs, for use in other palacios components, like vnet
 // The idea is that everything uses the same stubs
 void  palacios_print_scoped(void *vm, int vcore, const char *fmt, ...);
@@ -178,10 +181,10 @@ void  palacios_vfree(void *);             // use instead of vfree
 void *palacios_vaddr_to_paddr(void *vaddr);
 void *palacios_paddr_to_vaddr(void *paddr);
 void  palacios_xcall(int cpu_id, void (*fn)(void *arg), void *arg);
-void *palacios_create_and_start_kernel_thread(int (*fn)(void * arg), void *arg, char *thread_name);
-void *palacios_create_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name);
+void *palacios_create_and_start_kernel_thread(int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc);
+void *palacios_create_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc);
 void  palacios_start_thread(void *thread_ptr);
-void *palacios_creeate_and_start_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name);
+void *palacios_creeate_and_start_thread_on_cpu(int cpu_id, int (*fn)(void * arg), void *arg, char *thread_name, struct v3_resource_control *rc);
 int   palacios_move_thread_to_cpu(int new_cpu_id, void *thread_ptr);
 void  palacios_yield_cpu(void);
 void  palacios_sleep_cpu(unsigned int us);
@@ -228,5 +231,39 @@ void  palacios_mutex_unlock_irqrestore(void *mutex, void *flags);
 #define INFO(fmt, args...) printk((KERN_INFO "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
 #define DEBUG(fmt, args...) printk((KERN_DEBUG "palacios (pcore %u): " fmt), palacios_get_cpu(), ##args)
 
+/* Linux proc versioning */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+
+#define PAL_PROC_CREATE(ent, fname, perm, parent, fops) \
+    ent = proc_create(fname, perm, parent, fops); 
+
+#define PAL_PROC_CREATE_DATA(ent, fname, perm, parent, fops, data) \
+    ent = proc_create_data(fname, perm, parent, fops, data);
+
+#define PAL_PDE(inode) NULL
+#define PAL_PROC_GETDATA(inode) PDE_DATA((inode))
+
+#else
+
+#define PAL_PROC_CREATE(ent, fname, perm, parent, fops) \
+    ent = create_proc_entry(fname, perm, parent); \
+    if (ent) { \
+        ent->proc_fops = fops; \
+    }
+
+#define PAL_PROC_CREATE_DATA(ent, fname, perm, parent, fops, data) \
+    ent = proc_create_data(fname, perm, parent, fops, data);
+
+#define PAL_PDE(inode)          PDE((inode))
+#define PAL_PROC_GETDATA(inode) PDE((inode))->data
+
+#endif
+
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,9,0)
+#define strict_strtoull(s,b,r) kstrtoull(s,b,r)
+#endif
+
+
 
 #endif