X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fdisk_model.c;h=2c192f941cf59bf9a4b546516c3b05ecad57c1fd;hb=2377d33e71ba625a547b414916949181db2a49da;hp=b142547f8b6b18639a5be963f0f312fef16f3fd9;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git

diff --git a/palacios/src/devices/disk_model.c b/palacios/src/devices/disk_model.c
index b142547..2c192f9 100644
--- a/palacios/src/devices/disk_model.c
+++ b/palacios/src/devices/disk_model.c
@@ -91,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;
@@ -98,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;
   }
@@ -113,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;
     }