X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fos_debug.c;h=7abdeb0533127b2000b9cd05df6049f9a2aaee67;hp=e6ecf32f867f6b634e7a9c9b07000b7f4698033e;hb=4eb8163fe76127f9748caa43f8ffad1e4d739bb8;hpb=1df1d51642fd023684326023459da17765b428ce

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index e6ecf32..7abdeb0 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;