X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fdisk_model.c;h=2c192f941cf59bf9a4b546516c3b05ecad57c1fd;hb=a20c07e3428f9aa55997befebca7a30721a71145;hp=c1d8836dcacad5a001b5b2dcaa438f2ec6afd66d;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git

diff --git a/palacios/src/devices/disk_model.c b/palacios/src/devices/disk_model.c
index c1d8836..2c192f9 100644
--- a/palacios/src/devices/disk_model.c
+++ b/palacios/src/devices/disk_model.c
@@ -58,8 +58,12 @@ static uint64_t model_get_capacity(void * private_data) {
     return model->ops->get_capacity(model->private_data);
 }
 
-static int model_free(struct vm_device * dev) {
-    return -1;
+static int model_free(struct disk_state * model) {
+
+    // unhook from frontend
+
+    V3_Free(model);
+    return 0;
 }
 
 
@@ -73,7 +77,7 @@ static struct v3_dev_blk_ops blk_ops = {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = model_free,
+    .free = (int (*)(void *))model_free,
 };
 
 
@@ -87,6 +91,10 @@ static int connect_fn(struct v3_vm_info * vm,
   uint32_t seek_time = atoi(v3_cfg_val(cfg, "seek_us"));
   struct disk_state * model = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
 
+  if (!model) {
+      PrintError(vm, VCORE_NONE, "Cannot allocate\n");
+      return -1;
+  }
 
   model->ops = ops;
   model->seek_usecs = seek_time;
@@ -94,7 +102,7 @@ static int connect_fn(struct v3_vm_info * vm,
 
   if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"), 
 			 &blk_ops, frontend_cfg, model) == -1) {
-      PrintError("Could not connect  to frontend %s\n", 
+      PrintError(vm, VCORE_NONE, "Could not connect  to frontend %s\n", 
 		  v3_cfg_val(frontend_cfg, "tag"));
       return -1;
   }
@@ -109,12 +117,12 @@ static int model_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, NULL);
 
     if (dev == NULL) {
-	PrintError("Could not attach device %s\n", dev_id);
+	PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
 	return -1;
     }
 
     if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, NULL) == -1) {
-	PrintError("Could not register %s as block frontend\n", dev_id);
+	PrintError(vm, VCORE_NONE, "Could not register %s as block frontend\n", dev_id);
 	v3_remove_device(dev);
 	return -1;
     }