merge fix and changed file interface

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 620761a..8742ff6 100644 (file)
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -214,10 +214,6 @@ struct guest_info;
 
 #endif
 
-<<<<<<< HEAD:palacios/include/palacios/vmm.h
-
-=======
->>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
 /* ** */
 
 

diff --git a/palacios/include/palacios/vmm_file.h b/palacios/include/palacios/vmm_file.h
index b523475..cac4c4d 100644 (file)
--- a/palacios/include/palacios/vmm_file.h
+++ b/palacios/include/palacios/vmm_file.h
@@ -69,14 +69,14 @@
 
 struct v3_file_hooks {
 
-    int (*file_open)(const char * path, int mode);
-    int (*file_close)(int fd);
+    void (*file_open)(const char * path, int mode, void * host_data);
+    int (*file_close)(void * fd);
 
-    long long (*file_size)(int fd);
+    long long (*file_size)(void * fd);
 
     // blocking reads and writes
-    long long (*file_read)(int fd, void * buffer, long long length, long long offset);
-    long long (*file_write)(int fd, void * buffer, long long length, long long offset);
+    long long (*file_read)(void * fd, void * buffer, long long length, long long offset);
+    long long (*file_write)(void * fd, void * buffer, long long length, long long offset);
 
 };