ported packet to extension framework and fixed type in socket interface

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 76b4779..a5a5aeb 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -6,9 +6,6 @@
 #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"
@@ -29,6 +26,8 @@
 #define V3_VM_STREAM_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)
 
@@ -46,11 +45,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,15 +58,12 @@ 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
+    struct rb_root vm_ctrls;
+    struct list_head exts;
+
 
-#ifdef V3_CONFIG_CONSOLE
+#ifdef V3_CONFIG_GRAPHICS_CONSOLE
     struct palacios_graphics_console graphics_console;
 #endif