X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fpalacios.h;h=8730346fe2edb485fe6c1eb297c4f8186d50ea4c;hb=d0629f43f3f4714eea680f6715e114a6e514739b;hp=b1618320f782c10ac887acdae90b2516603dcdac;hpb=af8e64fe97d7e075fdc1db893e9bcb550e38db91;p=palacios-OLD.git

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index b161832..8730346 100644
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,33 +6,24 @@
 #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_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_INSPECT 30
+
+#define V3_VM_FB_INPUT (256+1)
+#define V3_VM_FB_QUERY (256+2)
 
-#define V3_VM_HOST_DEV_CONNECT 512+1
+#define V3_VM_HOST_DEV_CONNECT (10244+1)
+
+#define V3_VM_KSTREAM_USER_CONNECT (11244+1)
 
 
 struct v3_guest_img {
@@ -46,11 +37,6 @@ struct v3_mem_region {
     unsigned long long num_pages;
 };
 
-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,22 +50,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 rb_root vm_ctrls;
+    struct list_head exts;
 
     struct completion start_done;
     struct completion thread_done;
@@ -94,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 );