X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=49330281d7d905881f6ea02133a75f8ab6afc459;hb=c6376e3af2c48a2ec22e8521a3f96fa7923bf264;hp=76b4779307fedf94990bb79115f49995ce12f93c;hpb=4fdb3bc363a277d32fd95f58358470874b992c53;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 76b4779..4933028 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,51 +6,87 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#ifdef V3_CONFIG_CONSOLE
-#include "palacios-console.h"
-#endif
-
-#ifdef V3_CONFIG_GRAPHICS_CONSOLE
-#include "palacios-graphics-console.h"
-#endif
-
-#ifdef V3_CONFIG_HOST_DEVICE
-#include "palacios-host-dev.h"
-#endif
-
 
 /* Global Control IOCTLs */
-#define V3_START_GUEST 10
+#define V3_CREATE_GUEST 12
+#define V3_FREE_GUEST 13
+
 #define V3_ADD_MEMORY 50
-#define V3_START_NETWORK 60
 
 /* VM Specific IOCTLs */
 #define V3_VM_CONSOLE_CONNECT 20
 #define V3_VM_STREAM_CONNECT 21
-#define V3_VM_STOP 22
 
-#define V3_VM_FB_INPUT (256+1)
-#define V3_VM_FB_QUERY (256+2)
+#define V3_VM_PAUSE 23
+#define V3_VM_CONTINUE 24
+
+#define V3_VM_LAUNCH 25
+#define V3_VM_STOP 26
+#define V3_VM_LOAD 27
+#define V3_VM_SAVE 28
+#define V3_VM_SIMULATE 29
+
+#define V3_VM_INSPECT 30
+#define V3_VM_DEBUG 31
 
-#define V3_VM_HOST_DEV_CONNECT (10244+1)
+#define V3_VM_MOVE_CORE 33
 
+#define V3_VM_FB_INPUT 257
+#define V3_VM_FB_QUERY 258
+
+#define V3_VM_HOST_DEV_CONNECT 10245
+
+#define V3_VM_KSTREAM_USER_CONNECT 11245
+
+// KERN_EMERG    "<0>"  /* system is unusable               */
+// KERN_ALERT    "<1>"  /* action must be taken immediately */
+// KERN_CRIT     "<2>"  /* critical conditions              */
+// KERN_ERR      "<3>"  /* error conditions                 */
+// KERN_WARNING  "<4>"  /* warning conditions               */
+// KERN_NOTICE   "<5>"  /* normal but significant condition */
+// KERN_INFO     "<6>"  /* informational                    */
+// KERN_DEBUG    "<7>"  /* debug-level messages             */
+
+// All 'printk's should be changed to one of these macros, for easier control
+#define ERROR(fmt, args...) printk((KERN_ERR "palacios: " fmt), ##args)
+#define WARNING(fmt, args...) printk((KERN_WARNING "palacios: " fmt), ##args)
+#define NOTICE(fmt, args...) printk((KERN_NOTICE "palacios: " fmt), ##args)
+#define INFO(fmt, args...) printk((KERN_INFO "palacios: " fmt), ##args)
+#define DEBUG(fmt, args...) printk((KERN_DEBUG "palacios: " fmt), ##args)
+
+// Turn this on for unprefaced output
+#define V3_PRINTK_OLD_STYLE_OUTPUT 0
+// Maximum length output from printk
+#define V3_PRINTK_BUF_SIZE 1024
 
 struct v3_guest_img {
     unsigned long long size;
     void * guest_data;
     char name[128];
-};
+} __attribute__((packed));
 
 struct v3_mem_region {
     unsigned long long base_addr;
     unsigned long long num_pages;
-};
+} __attribute__((packed));
+
+struct v3_debug_cmd {
+    unsigned int core; 
+    unsigned int cmd;
+} __attribute__((packed));
+
+struct v3_core_move_cmd {
+    unsigned short vcore_id;
+    unsigned short pcore_id;
+} __attribute__((packed));
+
+struct v3_chkpt_info {
+    char store[128];
+    char url[256]; /* This might need to be bigger... */
+} __attribute__((packed));
+
+
 
-struct v3_network {
-    unsigned char socket;
-    unsigned char packet;
-    unsigned char vnet;
-};
 
 void * trace_malloc(size_t size, gfp_t flags);
 void trace_free(const void * objp);
@@ -64,25 +100,9 @@ struct v3_guest {
 
     char name[128];
 
-    struct list_head files;
-    struct list_head streams;
-    struct list_head sockets;
-
-#ifdef V3_CONFIG_CONSOLE
-    struct palacios_console console;
-#endif
-
-#ifdef V3_CONFIG_CONSOLE
-    struct palacios_graphics_console graphics_console;
-#endif
-
-#ifdef V3_CONFIG_HOST_DEVICE
-    struct palacios_host_dev hostdev;
-#endif
-
 
-    struct completion start_done;
-    struct completion thread_done;
+    struct rb_root vm_ctrls;
+    struct list_head exts;
 
     dev_t vm_dev; 
     struct cdev cdev;
@@ -94,11 +114,6 @@ struct v3_guest {
 
 
 
-
-
-extern void send_key_to_palacios(unsigned char status, unsigned char scan_code);
-
-
 int palacios_vmm_init( void );
 int palacios_vmm_exit( void );