};
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;
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;
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;
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:
-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;
};
static struct v3_device_ops dev_ops = {
- .free = debug_free,
+ .free = (int (*)(void *))debug_free,
};
state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
- V3_ASSERT(state != NULL);
+ if (state == NULL) {
+ PrintError("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);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
- if (v3_attach_device(vm, dev) == -1) {
+ if (dev == NULL) {
PrintError("Could not attach device %s\n", dev_id);
V3_Free(state);
return -1;
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);
+ v3_remove_device(dev);
return -1;
}