X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=46946375b5b1dae7259740e158c1a40104eca891;hb=a8686374c6aa74d805b32e7675f42f7ab9a0b348;hp=4c8cf62988b5becf0b252160b0f7248d30ad4a4d;hpb=b58fe2254858e3ecc94be5d86f2a93f2cfe0a0d5;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 4c8cf62..4694637 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 */
@@ -44,6 +45,8 @@
 
 #define V3_VM_MOVE_MEM 36
 
+#define V3_VM_RESET    40
+
 #define V3_VM_FB_INPUT 257
 #define V3_VM_FB_QUERY 258
 
@@ -90,6 +93,16 @@ struct v3_mem_move_cmd{
     unsigned short     pcore_id;
 } __attribute__((packed));
 
+struct v3_reset_cmd {
+#define V3_RESET_VM_ALL    0
+#define V3_RESET_VM_HRT    1
+#define V3_RESET_VM_ROS    2
+#define V3_RESET_VM_CORE_RANGE  3
+    unsigned int type;
+    unsigned int first_core;  // for CORE_RANGE
+    unsigned int num_cores;   // for CORE_RANGE
+} __attribute__((packed));
+    
 struct v3_chkpt_info {
     char store[128];
     char url[256]; /* This might need to be bigger... */
@@ -140,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 );
@@ -150,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, ...);
@@ -166,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);
@@ -216,5 +231,35 @@ 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
+
+
+
 
 #endif