X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fos_debug.c;h=97cdabc30cd5ec8e293e0d5f1f94e34f5f94efcb;hb=afca783e03bd737fe7bb02d498644df30bf5d4d9;hp=4d7e19a2bffad0ce46d4b905b33e0dd0b4f3360d;hpb=3e5e5a12e64630d7a37ed32b8d7e2d993c79f7e0;p=palacios.git

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index 4d7e19a..97cdabc 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -26,7 +26,6 @@
 #define BUF_SIZE 1024
 
 #define DEBUG_PORT1 0xc0c0
-#define DEBUG_HCALL 0xc0c0
 
 struct debug_state {
     char debug_buf[BUF_SIZE];
@@ -35,8 +34,8 @@ struct debug_state {
 };
 
 
-static int handle_gen_write(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    struct debug_state * state = (struct debug_state *)dev->private_data;
+static int handle_gen_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    struct debug_state * state = priv_data;
 
     state->debug_buf[state->debug_offset++] = *(char*)src;
 
@@ -50,8 +49,7 @@ static int handle_gen_write(struct guest_info * core, ushort_t port, void * src,
 }
 
 static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) {
-    struct vm_device * dev = (struct vm_device *)priv_data;
-    struct debug_state * state = (struct debug_state *)dev->private_data;
+    struct debug_state * state = (struct debug_state *)priv_data;
 
     int msg_len = info->vm_regs.rcx;
     addr_t msg_gpa = info->vm_regs.rbx;
@@ -63,12 +61,12 @@ static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_d
     }
 
     if (buf_is_va == 1) {
-	if (read_guest_va_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
+	if (v3_read_gva_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
 	    PrintError("Could not read debug message\n");
 	    return -1;
 	}
     } else {
-	if (read_guest_pa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
+	if (v3_read_gpa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
 	    PrintError("Could not read debug message\n");
 	    return -1;
 	}
@@ -83,10 +81,11 @@ static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_d
 
 
 
-static int debug_free(struct vm_device * dev) {
-    v3_dev_unhook_io(dev, DEBUG_PORT1);
+static int debug_free(struct debug_state * state) {
 
+    // unregister hypercall
 
+    V3_Free(state);
     return 0;
 };
 
@@ -94,10 +93,7 @@ static int debug_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = debug_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))debug_free,
 };
 
 
@@ -105,22 +101,27 @@ static struct v3_device_ops dev_ops = {
 
 static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct debug_state * state = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
     PrintDebug("Creating OS Debug Device\n");
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
+    if (dev == NULL) {
+	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(state);
+	return -1;
+    }
 
-    if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+    if (v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write) == -1) {
+	PrintError("Error hooking OS debug IO port\n");
+	v3_remove_device(dev);
 	return -1;
     }
 
-    v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write);
-    v3_register_hypercall(vm, DEBUG_HCALL, handle_hcall, dev);
+    v3_register_hypercall(vm, OS_DEBUG_HCALL, handle_hcall, state);
 
     state->debug_offset = 0;
     memset(state->debug_buf, 0, BUF_SIZE);