X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fstream.c;h=0c6aed2ef334b2fe7d76698ad65e0f849cf145a1;hb=901fc56e53aaae4ebd6e9c3f9879afc3288be824;hp=e470cd98bc62f9e6a6c8187ca06ee6b97b74d155;hpb=ae4e727a7abfdb7df9cb93769a0799494ec75254;p=palacios.git

diff --git a/palacios/src/devices/stream.c b/palacios/src/devices/stream.c
index e470cd9..0c6aed2 100644
--- a/palacios/src/devices/stream.c
+++ b/palacios/src/devices/stream.c
@@ -24,7 +24,7 @@
 #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;
@@ -52,7 +52,7 @@ static int stream_write(char *buf, uint_t length, void *private_data)
 
 static struct v3_stream_ops stream_ops = {
     .write = stream_write,
-    .read = stream_read
+    .read = stream_read,
 };
 
 static struct v3_device_ops dev_ops = {
@@ -69,6 +69,7 @@ static int stream_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
     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;
 
     /* read configuration */
     V3_ASSERT(frontend_cfg);
@@ -77,13 +78,13 @@ static int stream_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
 
     
     /* allocate state */
-    state = (struct cons_state *)V3_Malloc(sizeof(struct stream_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(ttypath, STREAM_OPEN_MODE_READ | STREAM_OPEN_MODE_WRITE);
+    state->stream = V3_StreamOpen(path, STREAM_OPEN_MODE_READ | STREAM_OPEN_MODE_WRITE);
     if (!state->stream) {
 	PrintError("Could not open localname %s\n", path);
 	V3_Free(state);
@@ -101,11 +102,10 @@ static int stream_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
 	return -1;
     }
 
-    /* attach to front-end display adapter */
-    v3_console_register_cga(frontend, &cons_ops, dev);
-
-	return 0;
+    v3_stream_register_serial(frontend, &stream_ops, dev);
+	
+    return 0;
 }
 
-device_register("CURSES_CONSOLE", cons_init)
+device_register("STREAM", stream_init)