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;
-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;
}