minor fix

[palacios.git] / palacios / src / devices / stream.c

diff --git a/palacios/src/devices/stream.c b/palacios/src/devices/stream.c
index 0c6aed2..66ee74f 100644 (file)
--- a/palacios/src/devices/stream.c
+++ b/palacios/src/devices/stream.c
@@ -24,37 +24,27 @@
 #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;
-    struct vm_device *frontend_dev;
+    v3_stream_t stream;
+
+    struct v3_dev_char_ops char_ops;
+
+    void * push_fn_arg;
 };
 
 
-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,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;
+    struct stream_state *state = (struct stream_state *)private_data;
     
-    return V3_StreamWrite(state->stream,buf,length);
+    return v3_stream_write(state->stream, buf, length);
 }
 
 
 
-static struct v3_stream_ops stream_ops = {
-    .write = stream_write,
-    .read = stream_read,
-};
-
 static struct v3_device_ops dev_ops = {
     .free = NULL,
     .reset = NULL,
@@ -64,46 +54,55 @@ 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);
     char * dev_id = v3_cfg_val(cfg, "ID");
-    char * path = v3_cfg_val(cfg, "localname");
-    struct stream_state *state;
+    char * stream_name = v3_cfg_val(cfg, "name");
+    struct stream_state * state = NULL;
+
+    v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
 
-    /* read configuration */
-    V3_ASSERT(frontend_cfg);
-    V3_ASSERT(frontend_tag);
-    V3_ASSERT(frontend);
 
-    
-    /* allocate state */
     state = (struct stream_state *)V3_Malloc(sizeof(struct stream_state));
-    V3_ASSERT(state);
-    state->frontend_dev = frontend;
-    V3_ASSERT(path);
-       
-    /* The system is responsible for interpreting the localname of the stream */
-    state->stream = V3_StreamOpen(path, STREAM_OPEN_MODE_READ | STREAM_OPEN_MODE_WRITE);
-    if (!state->stream) {
-       PrintError("Could not open localname %s\n", path);
+
+    if (state == NULL) {
+       PrintError("Could not allocate stream backend device\n");
+       return -1;
+    }
+
+    memset(state, 0, sizeof(struct stream_state));
+
+    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);
 
-    /* allocate device */
-    struct vm_device *dev = v3_allocate_device(dev_id, &dev_ops, state);
-    V3_ASSERT(dev);
+    if (dev == NULL) {
+       PrintError("Could not allocate device %s\n", dev_id);
+       return -1;
+    }
 
-    /* attach device to virtual machine */
     if (v3_attach_device(vm, dev) == -1) {
        PrintError("Could not attach device %s\n", dev_id);
        V3_Free(state);
        return -1;
     }
 
-    v3_stream_register_serial(frontend, &stream_ops, dev);
-       
+    if (v3_dev_connect_char(vm, v3_cfg_val(frontend_cfg, "tag"), 
+                           &(state->char_ops), frontend_cfg, 
+                           state, &(state->push_fn_arg)) == -1) {
+       PrintError("Could not connect %s to frontend %s\n", 
+                  dev_id, v3_cfg_val(frontend_cfg, "tag"));
+       return -1;
+    }
+    
+
+
     return 0;
 }