X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_stream.h;h=513cf73c627b433e0e26652f71b5e0ed7e263382;hb=e47ed16a96f6d7faa282bf757e9d2cc065d2657e;hp=02b7aed6180509f7a6d9a6a9e5a1d8d008800bf8;hpb=ae4e727a7abfdb7df9cb93769a0799494ec75254;p=palacios.git

diff --git a/palacios/include/palacios/vmm_stream.h b/palacios/include/palacios/vmm_stream.h
index 02b7aed..513cf73 100644
--- a/palacios/include/palacios/vmm_stream.h
+++ b/palacios/include/palacios/vmm_stream.h
@@ -21,55 +21,29 @@
 #ifndef __VMM_STREAM_H__
 #define __VMM_STREAM_H__
 
-#include <palacios/vmm.h>
 
 
 #ifdef __V3VEE__
+#include <palacios/vmm.h>
 
-#define V3_StreamOpen(path, mode)						\
-    ({									\
-	extern struct v3_stream_hooks *stream_hooks;				\
-	((stream_hooks) && (stream_hooks)->stream_open) ?				\
-	    (stream_hooks)->stream_open((path), (mode)) : NULL;		\
-    })
-
-#define V3_StreamRead(stream, b, l)					\
-    ({									\
-	extern struct v3_stream_hooks *stream_hooks;				\
-	((stream_hooks) && (stream_hooks)->stream_read) ?			\
-	    (stream_hooks)->stream_read((stream), (b), (l)) : -1;		\
-    })
-
-#define V3_StreamWrite(stream, b, l)					\
-    ({									\
-	extern struct v3_stream_hooks *stream_hooks;				\
-	((stream_hooks) && (stream_hooks)->stream_write) ?			\
-	    (stream_hooks)->stream_write((stream), (b), (l)) : -1;		\
-    })
-
+typedef void * v3_stream_t;
 
-#define V3_StreamClose(stream)						\
-    ({									\
-	extern struct v3_stream_hooks *stream_hooks;				\
-	((stream_hooks) && (stream_hooks)->stream_close) ?				\
-	    (stream_hooks)->stream_close((stream), (mode)) : NULL;	\
-    })
+/* VM Can be NULL */
+v3_stream_t v3_stream_open(struct v3_vm_info * vm, const char * name);
+int v3_stream_write(v3_stream_t stream, uint8_t * buf, uint32_t len);
 
+void v3_stream_close(v3_stream_t stream);
 
 #endif
 
-#define STREAM_OPEN_MODE_READ	(1 << 0)
-#define STREAM_OPEN_MODE_WRITE	(1 << 1)
 
 struct v3_stream_hooks {
-    void *(*stream_open)(const char *path, int mode);
-    int (*stream_read)(void *stream, char *buf, int len);
-    int (*stream_write)(void *stream, char *buf, int len);
-    int (*stream_close)(void *stream);
-
+    void *(*open)(const char * name, void * private_data);
+    int (*write)(void * stream, char * buf, int len);
+    void (*close)(void * stream);
 };
 
 
-extern void V3_Init_Stream(struct v3_stream_hooks * hooks);
+void V3_Init_Stream(struct v3_stream_hooks * hooks);
 
 #endif