X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fstream.c;h=359b0d4196e4bad5ce900f230c6cee9ce6cf8a6a;hb=ee75afdf55f45c216a5285eb2d6eadd934aac59c;hp=1b0d5c74d9cde3d09057709b5b438e6c99cc88d0;hpb=09a7d3811df9df65346e36419f553a38c8c45c72;p=palacios-OLD.git

diff --git a/palacios/src/devices/stream.c b/palacios/src/devices/stream.c
index 1b0d5c7..359b0d4 100644
--- a/palacios/src/devices/stream.c
+++ b/palacios/src/devices/stream.c
@@ -24,40 +24,26 @@
 #include <palacios/vmm_host_events.h>
 #include <palacios/vmm_lock.h>
 #include <palacios/vmm_string.h>
-#include <devices/serial.h>
+
 
 struct stream_state {
-    void *stream_in;
-    void *stream_out;
-    struct vm_device *frontend_dev;
-    struct v3_stream_ops stream_ops;
+    v3_stream_t stream;
+
+    struct v3_dev_char_ops * char_ops;
 };
 
-static int stream_read(char *buf, uint_t length, void *private_data) 
-{
-    struct vm_device *dev = (struct vm_device *) private_data;
-    struct stream_state *state = (struct stream_state *) dev->private_data;
-    
-    return V3_StreamRead(state->stream_out,buf,length);
-}
 
-static int stream_write(char *buf, uint_t length, void *private_data) 
+
+static int stream_write(uint8_t * buf, uint64_t length, void * private_data) 
 {
     struct vm_device *dev = (struct vm_device *) private_data;
     struct stream_state *state = (struct stream_state *) dev->private_data;
     
-    return V3_StreamWrite(state->stream_out,buf,length);
+    return v3_stream_write(state->stream, buf, length);
 }
 
 
-static void notify(void * data){
-    struct stream_state *state = (struct stream_state *)data;
-    char temp[1024];
-    int len;	
-	
-    len = V3_StreamRead(state->stream_in, temp, 1024);	
-    state->stream_ops.input(temp, len, state->stream_ops.front_data);
-}
+
 
 static struct v3_device_ops dev_ops = {
     .free = NULL,
@@ -68,35 +54,33 @@ static struct v3_device_ops dev_ops = {
 
 static int stream_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) 
 {
-    v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
-    const char * frontend_tag = v3_cfg_val(frontend_cfg, "tag");
-    struct vm_device * frontend = v3_find_dev(vm, frontend_tag);
+    //   v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
     char * dev_id = v3_cfg_val(cfg, "ID");
-    char * stream_in = v3_cfg_val(cfg, "stream_in");
-    char * stream_out = v3_cfg_val(cfg, "stream_out");
-    struct stream_state *state;
-
+    char * stream_name = v3_cfg_val(cfg, "stream");
+    struct stream_state * state = NULL;
 
-    V3_ASSERT(frontend_cfg);
-    V3_ASSERT(frontend_tag);
-    V3_ASSERT(frontend);
-    V3_ASSERT(stream_in);
-    V3_ASSERT(stream_out);
 
     state = (struct stream_state *)V3_Malloc(sizeof(struct stream_state));
+
     V3_ASSERT(state);
-    state->frontend_dev = frontend;
 
-    state->stream_out = V3_StreamOpen(stream_out, NULL, NULL, STREAM_OPEN_MODE_READ | STREAM_OPEN_MODE_WRITE);
-    state->stream_in = V3_StreamOpen(stream_in, notify, state, STREAM_OPEN_MODE_READ | STREAM_OPEN_MODE_WRITE);
-    if (!state->stream_out || !state->stream_in) {
-	PrintError("Could not open stream %s %s\n", stream_in, stream_out);
+
+    state->stream = v3_stream_open(vm, stream_name);
+
+    if (state->stream == NULL) {
+	PrintError("Could not open stream %s\n", stream_name);
 	V3_Free(state);
 	return -1;
     }
+
+    state->char_ops->write = stream_write;
 	
-    struct vm_device *dev = v3_allocate_device(dev_id, &dev_ops, state);
-    V3_ASSERT(dev);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
+
+    if (dev == NULL) {
+	PrintError("Could not allocate device %s\n", dev_id);
+	return -1;
+    }
 
     if (v3_attach_device(vm, dev) == -1) {
 	PrintError("Could not attach device %s\n", dev_id);
@@ -104,10 +88,7 @@ static int stream_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
 	return -1;
     }
 
-    state->stream_ops.read = stream_read;
-    state->stream_ops.write = stream_write;
 
-    v3_stream_register_serial(frontend, &(state->stream_ops), dev);
 
     return 0;
 }