X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fos_debug.c;h=53346a2bc903e54be7a893726dd54f57f9a12929;hb=f1e6da297651aadbc037f1635a82f41285a0a424;hp=e6ecf32f867f6b634e7a9c9b07000b7f4698033e;hpb=37c18b2c2335a41c68c2f0b779fd2b7d51ab216d;p=palacios.git

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index e6ecf32..53346a2 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,7 +34,7 @@ struct debug_state {
 };
 
 
-static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+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;
 
     state->debug_buf[state->debug_offset++] = *(char*)src;
@@ -55,16 +54,24 @@ static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_d
 
     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 (read_guest_va_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) {
+	    PrintError("Could not read debug message\n");
+	    return -1;
+	}
+    }	
 
     state->debug_buf[msg_len] = 0;
 
@@ -95,23 +102,24 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int debug_init(struct guest_info * vm, void * cfg_data) {
+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");
 
     state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
     PrintDebug("Creating OS Debug Device\n");
 
-    struct vm_device * dev = v3_allocate_device("OS_DEBUG", &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", "OS_DEBUG");
+	PrintError("Could not attach device %s\n", name);
 	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, dev);
 
     state->debug_offset = 0;
     memset(state->debug_buf, 0, BUF_SIZE);