}
-static int blk_free(struct vm_device * dev) {
- return -1;
+static int blk_free(struct blk_state * blk) {
+ V3_FreePages((void *)blk->blk_base_addr, blk->capacity / 4096);
+
+ V3_Free(blk);
+ return 0;
}
static struct v3_device_ops dev_ops = {
- .free = blk_free,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))blk_free,
+
};
static int blk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct blk_state * blk = NULL;
v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
- char * name = v3_cfg_val(cfg, "name");
+ char * dev_id = v3_cfg_val(cfg, "ID");
uint64_t capacity = atoi(v3_cfg_val(cfg, "size")) * 1024 * 1024;
if (!frontend_cfg) {
memset(blk->blk_space, 0, capacity);
- struct vm_device * dev = v3_allocate_device(name, &dev_ops, blk);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, blk);
- if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+ if (dev == NULL) {
+ PrintError("Could not attach device %s\n", dev_id);
+ V3_Free(blk);
return -1;
}
if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"),
&blk_ops, frontend_cfg, blk) == -1) {
PrintError("Could not connect %s to frontend %s\n",
- name, v3_cfg_val(frontend_cfg, "tag"));
+ dev_id, v3_cfg_val(frontend_cfg, "tag"));
+ v3_remove_device(dev);
return -1;
}