#define BUF_SIZE 1024
#define DEBUG_PORT1 0xc0c0
-#define DEBUG_HCALL 0xc0c0
struct debug_state {
char debug_buf[BUF_SIZE];
}
if (buf_is_va == 1) {
- if (read_guest_va_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
+ 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 (read_guest_pa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
+ 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;
}
static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct debug_state * state = NULL;
- char * name = v3_cfg_val(cfg, "name");
+ 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_allocate_device(name, &dev_ops, state);
+ struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+ PrintError("Could not attach device %s\n", dev_id);
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, dev);
state->debug_offset = 0;
memset(state->debug_buf, 0, BUF_SIZE);