X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=339999de341c695b85288e05761df56f83f9d409;hb=1bd025c8e158b2b5f4c8e8ccf1bcf8d702dde037;hp=42128b6e6821821fef93535336b1e6d79aacb09d;hpb=ec660ce1c5410ef08a7820f7ee064a30b416a523;p=palacios.git

diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c
index 42128b6..339999d 100644
--- a/palacios/src/devices/bochs_debug.c
+++ b/palacios/src/devices/bochs_debug.c
@@ -45,8 +45,7 @@ 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;
 
@@ -61,8 +60,7 @@ 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;
 
@@ -77,8 +75,7 @@ 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;
 
@@ -93,7 +90,6 @@ 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:
@@ -117,16 +113,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,7 +123,7 @@ static int debug_free(struct vm_device * dev) {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = debug_free,
+    .free = (int (*)(void *))debug_free,
 
 };
 
@@ -148,12 +137,15 @@ 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("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;
@@ -167,15 +159,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);
+	v3_remove_device(dev);
 	return -1;
     }