Initial integration and reimplementation of user-space interface for keyed streams

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 806e1e7..8730346 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,7 +6,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 
-#include "palacios-console.h"
 
 /* Global Control IOCTLs */
 #define V3_START_GUEST 10
@@ -14,9 +13,19 @@
 
 /* VM Specific IOCTLs */
 #define V3_VM_CONSOLE_CONNECT 20
-#define V3_VM_SERIAL_CONNECT 21
+
 #define V3_VM_STOP 22
 
+#define V3_VM_INSPECT 30
+
+#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;
@@ -29,6 +38,9 @@ struct v3_mem_region {
 };
 
 
+void * trace_malloc(size_t size, gfp_t flags);
+void trace_free(const void * objp);
+
 
 struct v3_guest {
     void * v3_ctx;
@@ -38,11 +50,9 @@ 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;
@@ -57,11 +67,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 );