changed device registration interface

[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 49ee033..c1d8836 100644 (file)
--- a/palacios/src/devices/disk_model.c
+++ b/palacios/src/devices/disk_model.c
@@ -106,15 +106,16 @@ static int model_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     char * dev_id = v3_cfg_val(cfg, "ID");
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, NULL);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, NULL);
 
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
        PrintError("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);
+       v3_remove_device(dev);
        return -1;
     }