*/
-#include <devices/bochs_debug.h>
+
#include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
#define BUF_SIZE 1024
}
-static int debug_init(struct vm_device * dev) {
- struct debug_state * state = (struct debug_state *)dev->private_data;
- state->debug_offset = 0;
- state->info_offset = 0;
- memset(state->debug_buf, 0, BUF_SIZE);
- memset(state->info_buf, 0, BUF_SIZE);
-
-
- v3_dev_hook_io(dev, BOCHS_PORT1, NULL, &handle_gen_write);
- v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write);
- v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write);
- v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write);
- v3_dev_hook_io(dev, BOCHS_CONSOLE_PORT, NULL, &handle_console_write);
-
-
- return 0;
-}
-static int debug_deinit(struct vm_device * dev) {
+static int debug_free(struct vm_device * dev) {
v3_dev_unhook_io(dev, BOCHS_PORT1);
v3_dev_unhook_io(dev, BOCHS_PORT2);
v3_dev_unhook_io(dev, BOCHS_INFO_PORT);
-static struct vm_device_ops dev_ops = {
- .init = debug_init,
- .deinit = debug_deinit,
+static struct v3_device_ops dev_ops = {
+ .free = debug_free,
.reset = NULL,
.start = NULL,
.stop = NULL,
};
-struct vm_device * v3_create_bochs_debug() {
+
+
+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));
V3_ASSERT(state != NULL);
PrintDebug("Creating Bochs Debug Device\n");
- struct vm_device * device = v3_create_device("BOCHS 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", name);
+ return -1;
+ }
+
+ state->debug_offset = 0;
+ state->info_offset = 0;
+ memset(state->debug_buf, 0, BUF_SIZE);
+ memset(state->info_buf, 0, BUF_SIZE);
- return device;
+ v3_dev_hook_io(dev, BOCHS_PORT1, NULL, &handle_gen_write);
+ v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write);
+ v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write);
+ v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write);
+ v3_dev_hook_io(dev, BOCHS_CONSOLE_PORT, NULL, &handle_console_write);
+
+
+ return 0;
}
+
+
+device_register("BOCHS_DEBUG", debug_init);