X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Finterfaces%2Fvmm_keyed_stream.c;h=99e4c221f985a2d13da84aa1a35c034e05f8eba4;hb=aeb2b4bea5822761eebe0c9f4d2bef40324354c7;hp=4ba376b8a1dd154bf1acf39e0e2bc157d7931256;hpb=ba178554a5f6714e5ceb7b77df462ac72de90b0c;p=palacios.releases.git

diff --git a/palacios/src/interfaces/vmm_keyed_stream.c b/palacios/src/interfaces/vmm_keyed_stream.c
index 4ba376b..99e4c22 100644
--- a/palacios/src/interfaces/vmm_keyed_stream.c
+++ b/palacios/src/interfaces/vmm_keyed_stream.c
@@ -28,8 +28,8 @@ struct v3_keyed_stream_hooks * keyed_stream_hooks = 0;
 
 v3_keyed_stream_t     v3_keyed_stream_open(char *url, v3_keyed_stream_open_t open_type)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->open != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->open != NULL);
 
     return keyed_stream_hooks->open(url,open_type);
 }
@@ -38,18 +38,26 @@ v3_keyed_stream_t     v3_keyed_stream_open(char *url, v3_keyed_stream_open_t ope
 	
 void                  v3_keyed_stream_close(v3_keyed_stream_t stream)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->close != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->close != NULL);
 
     return keyed_stream_hooks->close(stream);
 
 }
 
 
+void v3_keyed_stream_preallocate_hint_key(v3_keyed_stream_t stream, char *key, uint64_t size)
+{
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->preallocate_hint_key != NULL);
+
+    return keyed_stream_hooks->preallocate_hint_key(stream,key,size);
+}
+
 v3_keyed_stream_key_t v3_keyed_stream_open_key(v3_keyed_stream_t stream, char *key)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->open_key != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->open_key != NULL);
 
     return keyed_stream_hooks->open_key(stream,key);
 }
@@ -57,8 +65,8 @@ v3_keyed_stream_key_t v3_keyed_stream_open_key(v3_keyed_stream_t stream, char *k
 
 void                  v3_keyed_stream_close_key(v3_keyed_stream_t stream,  char *key)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->close_key != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->close_key != NULL);
 
     return keyed_stream_hooks->close_key(stream,key);
 }
@@ -66,31 +74,35 @@ void                  v3_keyed_stream_close_key(v3_keyed_stream_t stream,  char
 
 sint64_t              v3_keyed_stream_write_key(v3_keyed_stream_t stream,  
 						v3_keyed_stream_key_t key,
+						void *tag,
+						sint64_t taglen,
 						void *buf, 
 						sint64_t len)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->write_key != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->write_key != NULL);
 
-    return keyed_stream_hooks->write_key(stream,key,buf,len);
+    return keyed_stream_hooks->write_key(stream,key,tag,taglen,buf,len);
 }
 
 sint64_t              v3_keyed_stream_read_key(v3_keyed_stream_t stream,
 					       v3_keyed_stream_key_t key,
+					       void *tag,
+					       sint64_t taglen,
 					       void *buf, 
 					       sint64_t len)
 {
-    V3_ASSERT(keyed_stream_hooks != NULL);
-    V3_ASSERT(keyed_stream_hooks->read_key != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, keyed_stream_hooks->read_key != NULL);
 
-    return keyed_stream_hooks->read_key(stream,key,buf,len);
+    return keyed_stream_hooks->read_key(stream,key,tag,taglen,buf,len);
 }
 
 
 
 void V3_Init_Keyed_Streams(struct v3_keyed_stream_hooks * hooks) {
     keyed_stream_hooks = hooks;
-    PrintDebug("V3 keyed stream support inited\n");
+    PrintDebug(VM_NONE, VCORE_NONE, "V3 keyed stream support inited\n");
 
     return;
 }