X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fos_debug.c;h=f27dca31322da1d5a0381ed7b94f1b80960cd95e;hb=a34275476494aeabed460b284a70cfc9b66a9896;hp=7abdeb0533127b2000b9cd05df6049f9a2aaee67;hpb=4eb8163fe76127f9748caa43f8ffad1e4d739bb8;p=palacios.git diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c index 7abdeb0..f27dca3 100644 --- a/palacios/src/devices/os_debug.c +++ b/palacios/src/devices/os_debug.c @@ -26,7 +26,7 @@ #define BUF_SIZE 1024 #define DEBUG_PORT1 0xc0c0 -#define DEBUG_HCALL 0xc0c0 +#define HEARTBEAT_PORT 0x99 struct debug_state { char debug_buf[BUF_SIZE]; @@ -35,13 +35,13 @@ struct debug_state { }; -static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) { - struct debug_state * state = (struct debug_state *)dev->private_data; +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; 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); + PrintDebug(core->vm_info, core, "VM_CONSOLE>%s", state->debug_buf); memset(state->debug_buf, 0, BUF_SIZE); state->debug_offset = 0; } @@ -49,77 +49,142 @@ static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_ return length; } +static int handle_hb_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + uint32_t val = 0; + + if (length == 1) { + val = *(uint8_t *)src; + } else if (length == 2) { + val = *(uint16_t *)src; + } else { + val = *(uint32_t *)src; + } + + V3_Print(core->vm_info, core, "HEARTBEAT> %x (%d)\n", val, val); + + 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; + struct debug_state * state = (struct debug_state *)priv_data; 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); + PrintError(info->vm_info, info, "Console message too large for buffer (len=%d)\n", msg_len); 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"); + if (v3_read_gva_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) { + PrintError(info->vm_info, info, "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"); + if (v3_read_gpa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) { + PrintError(info->vm_info, info, "Could not read debug message\n"); return -1; } } state->debug_buf[msg_len] = 0; - PrintDebug("VM_CONSOLE>%s\n", state->debug_buf); + PrintDebug(info->vm_info, info, "VM_CONSOLE>%s\n", state->debug_buf); return 0; } -static int debug_free(struct vm_device * dev) { - v3_dev_unhook_io(dev, DEBUG_PORT1); +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_SAVE_AUTOTAG(ctx, dbg->debug_buf, savefailout); + V3_CHKPT_SAVE_AUTOTAG(ctx, dbg->debug_offset, savefailout); + + return 0; + + savefailout: + PrintError(VM_NONE,VCORE_NONE, "Failed to save debug\n"); + return -1; + +} + + +static int debug_load(struct v3_chkpt_ctx * ctx, void * private_data) { + struct debug_state * dbg = (struct debug_state *)private_data; + + V3_CHKPT_LOAD_AUTOTAG(ctx, dbg->debug_buf,loadfailout); + V3_CHKPT_LOAD_AUTOTAG(ctx, dbg->debug_offset,loadfailout); + + return 0; + + loadfailout: + PrintError(VM_NONE, VCORE_NONE, "Failed to load debug\n"); + return -1; +} + +#endif static struct v3_device_ops dev_ops = { - .free = debug_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))debug_free, +#ifdef V3_CONFIG_CHECKPOINT + .save = debug_save, + .load = debug_load +#endif }; -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 * dev_id = v3_cfg_val(cfg, "ID"); state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state)); - PrintDebug("Creating OS Debug Device\n"); + if (!state) { + PrintError(vm, VCORE_NONE, "Cannot allocate in init\n"); + return -1; + } + + PrintDebug(vm, VCORE_NONE, "Creating OS Debug Device\n"); - struct vm_device * dev = v3_allocate_device("OS_DEBUG", &dev_ops, state); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state); + + if (dev == NULL) { + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id); + V3_Free(state); + return -1; + } + + if (v3_dev_hook_io(dev, DEBUG_PORT1, NULL, &handle_gen_write) == -1) { + PrintError(vm, VCORE_NONE, "Error hooking OS debug IO port\n"); + v3_remove_device(dev); + return -1; + } - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", "OS_DEBUG"); + if (v3_dev_hook_io(dev, HEARTBEAT_PORT, NULL, &handle_hb_write) == -1) { + PrintError(vm, VCORE_NONE, "error hooking OS heartbeat port\n"); + v3_remove_device(dev); 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, state); state->debug_offset = 0; memset(state->debug_buf, 0, BUF_SIZE);