inspector updates

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 3ee850a..c0e3ba2 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -4,16 +4,20 @@
 #include <linux/cdev.h>
 #include <linux/list.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
+#ifdef V3_CONFIG_CONSOLE
 #include "palacios-console.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_SERIAL_CONNECT 21
+#define V3_VM_STREAM_CONNECT 21
 #define V3_VM_STOP 22
 
 struct v3_guest_img {
@@ -27,6 +31,14 @@ 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);
 
 
 struct v3_guest {
@@ -41,8 +53,11 @@ struct v3_guest {
     struct list_head streams;
     struct list_head sockets;
 
+#ifdef V3_CONFIG_CONSOLE
     struct palacios_console console;
+#endif
 
+    struct completion start_done;
     struct completion thread_done;
 
     dev_t vm_dev;