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

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index 2ceac6f..f821415 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -18,71 +18,141 @@
  */
 
 
-#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_PORT1 0xcc
+struct debug_state {
+    char debug_buf[BUF_SIZE];
+    uint_t debug_offset;
 
+};
 
 
+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;
 
-static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-  PrintError("OS_DEBUG Write\n");
+    state->debug_buf[state->debug_offset++] = *(char*)src;
 
-  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;
-  }
+    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;
+    return length;
 }
 
+static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) {
+    struct debug_state * state = (struct debug_state *)priv_data;
 
-static int debug_init(struct vm_device * dev) {
+    int msg_len = info->vm_regs.rcx;
+    addr_t msg_gpa = info->vm_regs.rbx;
+    int buf_is_va = info->vm_regs.rdx;
 
-  v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write);
+    if (msg_len >= BUF_SIZE) {
+	PrintError("Console message too large for buffer (len=%d)\n", msg_len);
+	return -1;
+    }
 
-  
-  return 0;
+    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;
+
+    PrintDebug("VM_CONSOLE>%s\n", state->debug_buf);
+
+    return 0;
 }
 
-static int debug_deinit(struct vm_device * dev) {
-  v3_dev_unhook_io(dev, DEBUG_PORT1);
 
 
-  return 0;
+static int debug_free(struct debug_state * state) {
+
+    // unregister hypercall
+
+    V3_Free(state);
+    return 0;
 };
 
+#ifdef V3_CONFIG_CHECKPOINT
+static int debug_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct debug_state * dbg = (struct debug_state *)private_data;
+    
+    V3_CHKPT_STD_SAVE(ctx, dbg->debug_buf);
+    V3_CHKPT_STD_SAVE(ctx, dbg->debug_offset);
+    
+    return 0;
+}
+
+
+static int debug_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct debug_state * dbg = (struct debug_state *)private_data;
+    
+    V3_CHKPT_STD_LOAD(ctx, dbg->debug_buf);
+    V3_CHKPT_STD_LOAD(ctx, dbg->debug_offset);
+    
+    return 0;
+}
+
+#endif
 
 
 
-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,
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = debug_save,
+    .load = debug_load
+#endif 
 };
 
 
-struct vm_device * v3_create_os_debug() {
 
-  PrintDebug("Creating OS Debug Device\n");
-  struct vm_device * device = v3_create_device("OS Debug", &dev_ops, NULL);
 
+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 * 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;
+    }
 
-  return device;
+    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);
+
+    state->debug_offset = 0;
+    memset(state->debug_buf, 0, BUF_SIZE);
+  
+    return 0;
 }
+
+
+device_register("OS_DEBUG", debug_init)