Context-based output infrastructure (V3_Print, etc) and modifications to use it

[palacios.git] / palacios / src / devices / disk_model.c

diff --git a/palacios/src/devices/disk_model.c b/palacios/src/devices/disk_model.c
index 4ef62b9..2c192f9 100644 (file)
--- a/palacios/src/devices/disk_model.c
+++ b/palacios/src/devices/disk_model.c
@@ -19,7 +19,6 @@
 
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_sym_swap.h>
 #include <palacios/vm_guest.h>
 
 
@@ -59,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;
 }
 
 
@@ -74,10 +77,7 @@ static struct v3_dev_blk_ops blk_ops = {
 
 
 static struct v3_device_ops dev_ops = {
-    .free = model_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))model_free,
 };
 
 
@@ -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;
   }
@@ -108,17 +112,18 @@ static int connect_fn(struct v3_vm_info * vm,
 
 static int model_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, NULL);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, NULL);
 
-    if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", name);
+    if (dev == NULL) {
+       PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
        return -1;
     }
 
-    if (v3_dev_add_blk_frontend(vm, name, connect_fn, NULL) == -1) {
-       PrintError("Could not register %s as block frontend\n", name);
+    if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, NULL) == -1) {
+       PrintError(vm, VCORE_NONE, "Could not register %s as block frontend\n", dev_id);
+       v3_remove_device(dev);
        return -1;
     }