X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=339999de341c695b85288e05761df56f83f9d409;hb=ea98f071ad004a040cefbb494733f4f1cb0d75d7;hp=66310230beead4c4d59179e0118fdc6ffd89f04d;hpb=a0d3be5212e7a5053ba213ce7bd26c7124cf01e3;p=palacios.git

diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c
index 6631023..339999d 100644
--- a/palacios/src/devices/bochs_debug.c
+++ b/palacios/src/devices/bochs_debug.c
@@ -113,11 +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;
+static int debug_free(struct debug_state * state) {
 
     V3_Free(state);
-
     return 0;
 };
 
@@ -125,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,
 
 };
 
@@ -139,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;
@@ -166,7 +167,7 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     
     if (ret != 0) {
 	PrintError("Could not hook Bochs Debug IO Ports\n");
-	v3_detach_device(dev);
+	v3_remove_device(dev);
 	return -1;
     }