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

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index de30961..97cdabc 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -18,14 +18,14 @@
  */
 
 
-#include <devices/os_debug.h>
+
 #include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
 #include <palacios/vm_guest_mem.h>
 
 #define BUF_SIZE 1024
 
 #define DEBUG_PORT1 0xc0c0
-#define DEBUG_HCALL 0xc0c0
 
 struct debug_state {
     char debug_buf[BUF_SIZE];
@@ -34,8 +34,8 @@ struct debug_state {
 };
 
 
-static int handle_gen_write(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;
 
@@ -49,21 +49,28 @@ static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_
 }
 
 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;
-    
+    int buf_is_va = info->vm_regs.rdx;
+
     if (msg_len >= BUF_SIZE) {
 	PrintError("Console message too large for buffer (len=%d)\n", msg_len);
 	return -1;
     }
-    
-    if (read_guest_pa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
-	PrintError("Could not read debug message\n");
-	return -1;
-    }
+
+    if (buf_is_va == 1) {
+	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 (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;
+	}
+    }	
 
     state->debug_buf[msg_len] = 0;
 
@@ -73,46 +80,54 @@ static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_d
 }
 
 
-static int debug_init(struct vm_device * dev) {
-    struct debug_state * state = (struct debug_state *)dev->private_data;
 
-    v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write);
-    v3_register_hypercall(dev->vm, DEBUG_HCALL, handle_hcall, dev);
-
-    state->debug_offset = 0;
-    memset(state->debug_buf, 0, BUF_SIZE);
-  
-    return 0;
-}
-
-static int debug_deinit(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;
 };
 
 
 
 
-static struct vm_device_ops dev_ops = {
-    .init = debug_init,
-    .deinit = debug_deinit,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))debug_free,
 };
 
 
-struct vm_device * v3_create_os_debug() {
+
+
+static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct debug_state * state = NULL;
+    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 * device = v3_create_device("OS Debug", &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_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_register_hypercall(vm, OS_DEBUG_HCALL, handle_hcall, state);
 
-    return device;
+    state->debug_offset = 0;
+    memset(state->debug_buf, 0, BUF_SIZE);
+  
+    return 0;
 }
+
+
+device_register("OS_DEBUG", debug_init)