X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnetdisk.c;h=60f71ffb306518a9e612f17942176f1332300b17;hb=c337a47be935380fba4b7425e80be7c089e45e6c;hp=b2e76b1de7032260de8ff58c3f2efc72f08707b4;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios.releases.git

diff --git a/palacios/src/devices/netdisk.c b/palacios/src/devices/netdisk.c
index b2e76b1..60f71ff 100644
--- a/palacios/src/devices/netdisk.c
+++ b/palacios/src/devices/netdisk.c
@@ -286,15 +286,17 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     disk->port = atoi(port_str);
     disk->vm = vm;
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, disk);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, disk);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(disk);
 	return -1;
     }
 
     if (socket_init(disk) == -1) {
 	PrintError("could not initialize network connection\n");
+	v3_remove_device(dev);
 	return -1;
     }
 
@@ -303,6 +305,7 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"), 
 			   &blk_ops, frontend_cfg, disk) == -1) {
 	PrintError("Could not connect %s to frontend\n", dev_id);
+	v3_remove_device(dev);
 	return -1;
     }