X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=7f2f3ba9440c3c250be406580162986c2ed5365a;hb=4454a172129d12e97793c9c353339b85d3335af4;hp=adba8356fb8b4d03f01b518cacdf841efef0cf66;hpb=1df601c90b519a54b64ca101fd6aa4c0a39bf0f0;p=palacios.git diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c index adba835..7f2f3ba 100644 --- a/palacios/src/devices/bochs_debug.c +++ b/palacios/src/devices/bochs_debug.c @@ -22,6 +22,7 @@ #include #include #include +#include #define BUF_SIZE 1024 @@ -45,13 +46,12 @@ struct debug_state { }; static int handle_info_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { - struct vm_device * dev = priv_data; - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)priv_data; state->info_buf[state->info_offset++] = *(char*)src; if ((*(char*)src == 0xa) || (state->info_offset == (BUF_SIZE - 1))) { - PrintDebug("BOCHSINFO>%s", state->info_buf); + PrintDebug(core->vm_info, core, "BIOSINFO>%s", state->info_buf); memset(state->info_buf, 0, BUF_SIZE); state->info_offset = 0; } @@ -61,13 +61,12 @@ static int handle_info_write(struct guest_info * core, ushort_t port, void * src static int handle_debug_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { - struct vm_device * dev = priv_data; - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)priv_data; state->debug_buf[state->debug_offset++] = *(char*)src; if ((*(char*)src == 0xa) || (state->debug_offset == (BUF_SIZE - 1))) { - PrintDebug("BOCHSDEBUG>%s", state->debug_buf); + PrintDebug(core->vm_info, core, "BIOSDEBUG>%s", state->debug_buf); memset(state->debug_buf, 0, BUF_SIZE); state->debug_offset = 0; } @@ -77,13 +76,12 @@ static int handle_debug_write(struct guest_info * core, ushort_t port, void * sr static int handle_console_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { - struct vm_device * dev = priv_data; - struct debug_state * state = (struct debug_state *)dev->private_data; + struct debug_state * state = (struct debug_state *)priv_data; state->cons_buf[state->cons_offset++] = *(char *)src; if ((*(char *)src == 0xa) || (state->cons_offset == (BUF_SIZE - 1))) { - V3_Print("BOCHSCONSOLE>%s", state->cons_buf); + V3_Print(core->vm_info, core, "BIOSCONSOLE>%s", state->cons_buf); memset(state->cons_buf, 0, BUF_SIZE); state->cons_offset = 0; } @@ -93,20 +91,19 @@ static int handle_console_write(struct guest_info * core, ushort_t port, void * static int handle_gen_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { - //struct vm_device * dev = priv_data; switch (length) { case 1: - PrintDebug(">0x%.2x\n", *(uchar_t*)src); + PrintDebug(core->vm_info, core, ">0x%.2x\n", *(uchar_t*)src); break; case 2: - PrintDebug(">0x%.4x\n", *(ushort_t*)src); + PrintDebug(core->vm_info, core, ">0x%.4x\n", *(ushort_t*)src); break; case 4: - PrintDebug(">0x%.8x\n", *(uint_t*)src); + PrintDebug(core->vm_info, core, ">0x%.8x\n", *(uint_t*)src); break; default: - PrintError("Invalid length in handle_gen_write\n"); + PrintError(core->vm_info, core, "Invalid length in handle_gen_write\n"); return -1; break; } @@ -117,16 +114,9 @@ static int handle_gen_write(struct guest_info * core, ushort_t port, void * src, -static int debug_free(struct vm_device * dev) { - struct debug_state * state = dev->private_data; - - v3_unhook_io_port(dev->vm, BOCHS_PORT1); - v3_unhook_io_port(dev->vm, BOCHS_PORT2); - v3_unhook_io_port(dev->vm, BOCHS_INFO_PORT); - v3_unhook_io_port(dev->vm, BOCHS_DEBUG_PORT); +static int debug_free(struct debug_state * state) { V3_Free(state); - return 0; }; @@ -134,10 +124,8 @@ static int debug_free(struct vm_device * dev) { static struct v3_device_ops dev_ops = { - .free = debug_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))debug_free, + }; @@ -150,13 +138,16 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state)); - V3_ASSERT(state != NULL); + if (state == NULL) { + PrintError(vm, VCORE_NONE, "Could not allocate bochs debug state\n"); + return -1; + } - PrintDebug("Creating Bochs Debug Device\n"); - struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state); + PrintDebug(vm, VCORE_NONE, "Creating Bochs Debug Device\n"); + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", dev_id); + if (dev == NULL) { + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id); V3_Free(state); return -1; } @@ -169,15 +160,15 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { memset(state->cons_buf, 0, BUF_SIZE); - ret |= v3_hook_io_port(vm, BOCHS_PORT1, NULL, &handle_gen_write, dev); - ret |= v3_hook_io_port(vm, BOCHS_PORT2, NULL, &handle_gen_write, dev); - ret |= v3_hook_io_port(vm, BOCHS_INFO_PORT, NULL, &handle_info_write, dev); - ret |= v3_hook_io_port(vm, BOCHS_DEBUG_PORT, NULL, &handle_debug_write, dev); - ret |= v3_hook_io_port(vm, BOCHS_CONSOLE_PORT, NULL, &handle_console_write, dev); + ret |= v3_dev_hook_io(dev, BOCHS_PORT1, NULL, &handle_gen_write); + ret |= v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write); + ret |= v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write); + ret |= v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write); + ret |= v3_dev_hook_io(dev, BOCHS_CONSOLE_PORT, NULL, &handle_console_write); if (ret != 0) { - PrintError("Could not hook Bochs Debug IO Ports\n"); - v3_detach_device(dev); + PrintError(vm, VCORE_NONE, "Could not hook Bochs Debug IO Ports\n"); + v3_remove_device(dev); return -1; }