This patch fixes several issues with the console/cga code:

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

diff --git a/palacios/src/devices/telnet_cons.c b/palacios/src/devices/telnet_cons.c
index 4abe5a0..d0c2b1f 100644 (file)
--- a/palacios/src/devices/telnet_cons.c
+++ b/palacios/src/devices/telnet_cons.c
@@ -29,8 +29,10 @@
 #include <palacios/vmm_string.h>
 #include <palacios/vmm_socket.h>
 
-#include <devices/cga.h>
+#include <devices/console.h>
+#if 0
 #include <devices/telnet_cons.h>
+#endif
 
 #define NUM_ROWS 25
 #define NUM_COLS 80
@@ -354,7 +356,7 @@ static int screen_update(uint_t x, uint_t y, uint_t length, void * private_data)
     return ret;
 }
 
-static int scroll(uint_t rows, void * private_data) {
+static int scroll(int rows, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct cons_state * state = (struct cons_state *)dev->private_data;
     addr_t irq_state = 0;
@@ -516,26 +518,29 @@ static int cons_server(void * arg) {
        state->connected = 0;
        V3_Close_Socket(state->client_fd);
     }
+    
+    return -1;
 }
 
 
-static int cons_init(struct guest_info * vm, void * cfg_data) {
-    struct telnet_cons_cfg * cfg = (struct telnet_cons_cfg *)cfg_data;
+static int cons_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct cons_state * state = (struct cons_state *)V3_Malloc(sizeof(struct cons_state));
-    struct vm_device * frontend = v3_find_dev(vm, cfg->frontend);
+    v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
+    struct vm_device * frontend = v3_find_dev(vm, v3_cfg_val(frontend_cfg, "id"));
+    char * name = v3_cfg_val(cfg, "name");
 
 
     state->server_fd = 0;
     state->client_fd = 0;
     state->frontend_dev = frontend;
-    state->port = cfg->port;
+    state->port = atoi(v3_cfg_val(cfg, "port"));
     v3_lock_init(&(state->cons_lock));
 
 
-    struct vm_device * dev = v3_allocate_device("TELNET_CONS", &dev_ops, state);
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
 
     if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", "TELNET_CONS");
+       PrintError("Could not attach device %s\n", name);
        return -1;
     }