#include <palacios/vmm.h>
#include <palacios/vmm_dev_mgr.h>
#include <palacios/vmm_io.h>
+#include <palacios/vm_guest.h>
#define BUF_SIZE 1024
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;
}
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;
}
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;
}
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;
}
-static int debug_free(struct vm_device * dev) {
- struct debug_state * state = dev->private_data;
+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(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;
}
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;
}