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

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index e6ecf32..a51dc19 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -55,16 +55,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,18 +103,19 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int debug_init(struct guest_info * vm, void * cfg_data) {
+static int debug_init(struct guest_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;
     }