X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=5eca55d4702a377161273be9fdf3e494e3105749;hb=0b342d28c860e4b3911b529f5363d35faa86aa25;hp=892336183ccb9a12ba36da00ed077cb945e8aeb8;hpb=fed3449f4fd2fab7f27a17e0970e954bd2d69abc;p=palacios.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 8923361..5eca55d 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,51 +6,59 @@
 #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_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_INSPECT 30
+
+#define V3_VM_MOVE_CORE 33
 
 #define V3_VM_FB_INPUT (256+1)
 #define V3_VM_FB_QUERY (256+2)
 
 #define V3_VM_HOST_DEV_CONNECT (10244+1)
 
+#define V3_VM_KSTREAM_USER_CONNECT (11244+1)
+
 
 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_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);
@@ -66,27 +74,7 @@ struct v3_guest {
 
 
     struct rb_root vm_ctrls;
-
-
-    struct list_head files;
-    struct list_head streams;
-    struct list_head sockets;
-
-#ifdef V3_CONFIG_CONSOLE
-    struct palacios_console console;
-#endif
-
-#ifdef V3_CONFIG_GRAPHICS_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 list_head exts;
 
     dev_t vm_dev; 
     struct cdev cdev;
@@ -98,11 +86,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 );