X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=3a253ee9255ddc1bbfbd718116d249657f3c2ae4;hb=a489c2ba0f26f4be1fa98d4af2c2bfa113c28dde;hp=3ee850ad9b25e7ce28d10878d25180c6de1ed514;hpb=260bb3e805ebc92ae294c3c2b36d027ba8bca488;p=palacios-OLD.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 3ee850a..3a253ee 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -4,8 +4,8 @@
 #include <linux/cdev.h>
 #include <linux/list.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
-#include "palacios-console.h"
 
 /* Global Control IOCTLs */
 #define V3_START_GUEST 10
@@ -13,8 +13,22 @@
 
 /* VM Specific IOCTLs */
 #define V3_VM_CONSOLE_CONNECT 20
-#define V3_VM_SERIAL_CONNECT 21
+
 #define V3_VM_STOP 22
+#define V3_VM_PAUSE 23
+#define V3_VM_CONTINUE 24
+
+#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;
@@ -27,6 +41,14 @@ struct v3_mem_region {
     unsigned long long num_pages;
 };
 
+struct v3_core_move_cmd{
+    uint16_t vcore_id;
+    uint16_t pcore_id;
+};
+
+
+void * trace_malloc(size_t size, gfp_t flags);
+void trace_free(const void * objp);
 
 
 struct v3_guest {
@@ -37,12 +59,11 @@ struct v3_guest {
 
     char name[128];
 
-    struct list_head files;
-    struct list_head streams;
-    struct list_head sockets;
 
-    struct palacios_console console;
+    struct rb_root vm_ctrls;
+    struct list_head exts;
 
+    struct completion start_done;
     struct completion thread_done;
 
     dev_t vm_dev; 
@@ -55,11 +76,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 );