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

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index 2ceac6f..de30961 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -20,69 +20,99 @@
 
 #include <devices/os_debug.h>
 #include <palacios/vmm.h>
+#include <palacios/vm_guest_mem.h>
 
+#define BUF_SIZE 1024
 
-#define DEBUG_PORT1 0xcc
+#define DEBUG_PORT1 0xc0c0
+#define DEBUG_HCALL 0xc0c0
 
+struct debug_state {
+    char debug_buf[BUF_SIZE];
+    uint_t debug_offset;
 
+};
 
 
 static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-  PrintError("OS_DEBUG Write\n");
-
-  switch (length) {
-  case 1:
-    PrintDebug("OS_DEBUG ->0x%.2x\n", *(uchar_t*)src);
-    break;
-  case 2:
-    PrintDebug("OS_DEBUG ->0x%.4x\n", *(ushort_t*)src);
-    break;
-  case 4:
-    PrintDebug("OS_DEBUG ->0x%.8x\n", *(uint_t*)src);
-    break;
-  default:
-    PrintError("OS_DEBUG -> Invalid length in handle_gen_write\n");
-    return -1;
-    break;
-  }
-
-  return length;
+    struct debug_state * state = (struct debug_state *)dev->private_data;
+
+    state->debug_buf[state->debug_offset++] = *(char*)src;
+
+    if ((*(char*)src == 0xa) ||  (state->debug_offset == (BUF_SIZE - 1))) {
+	PrintDebug("VM_CONSOLE>%s", state->debug_buf);
+	memset(state->debug_buf, 0, BUF_SIZE);
+	state->debug_offset = 0;
+    }
+
+    return length;
+}
+
+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;
+
+    int msg_len = info->vm_regs.rcx;
+    addr_t msg_gpa = info->vm_regs.rbx;
+    
+    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;
+    }
+
+    state->debug_buf[msg_len] = 0;
+
+    PrintDebug("VM_CONSOLE>%s\n", state->debug_buf);
+
+    return 0;
 }
 
 
 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_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;
+    return 0;
 }
 
 static int debug_deinit(struct vm_device * dev) {
-  v3_dev_unhook_io(dev, DEBUG_PORT1);
+    v3_dev_unhook_io(dev, DEBUG_PORT1);
 
 
-  return 0;
+    return 0;
 };
 
 
 
 
 static struct vm_device_ops dev_ops = {
-  .init = debug_init,
-  .deinit = debug_deinit,
-  .reset = NULL,
-  .start = NULL,
-  .stop = NULL,
+    .init = debug_init,
+    .deinit = debug_deinit,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
 };
 
 
 struct vm_device * v3_create_os_debug() {
+    struct debug_state * state = NULL;
+
+    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, NULL);
+    PrintDebug("Creating OS Debug Device\n");
+    struct vm_device * device = v3_create_device("OS Debug", &dev_ops, state);
 
 
 
-  return device;
+    return device;
 }