merge fix and changed file interface

[palacios.git] / palacios / include / palacios / vmm_file.h

diff --git a/palacios/include/palacios/vmm_file.h b/palacios/include/palacios/vmm_file.h
index bf4a1d0..cac4c4d 100644 (file)
--- a/palacios/include/palacios/vmm_file.h
+++ b/palacios/include/palacios/vmm_file.h
@@ -51,14 +51,14 @@
     ({                                                                 \
        extern struct v3_file_hooks * file_hooks;                       \
        ((file_hooks) && (file_hooks)->file_read) ?                     \
-           (file_hooks)->file_read((fd), (start), (buf), (len)) : -1;  \
+           (file_hooks)->file_read((fd), (buf), (len), (start)) : -1;  \
     })
 
 #define V3_FileWrite(fd,start,buf,len)                                 \
     ({                                                                 \
        extern struct v3_file_hooks * file_hooks;                       \
        ((file_hooks) && (file_hooks)->file_write) ?                    \
-           (file_hooks)->file_write((fd), (start), (buf), (len)) : -1; \
+           (file_hooks)->file_write((fd), (buf), (len), (start)) : -1; \
     })
 
 
@@ -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,  long long start, void * buffer, long long length);
-    long long (*file_write)(int fd, long long start, void * buffer, long long length);
+    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);
 
 };