Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / linux_module / palacios.h

diff --git a/linux_module/palacios.h b/linux_module/palacios.h
index 1498b73..9f27187 100644 (file)
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@ -11,6 +11,7 @@
 /* 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
@@ -28,6 +29,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 {
@@ -44,6 +53,7 @@ struct v3_guest {
 
     struct palacios_console console;
 
+    struct completion start_done;
     struct completion thread_done;
 
     dev_t vm_dev;