return -1;
}
- PrintDebug("Capacity: %p\n", (void *)(disk->capacity));
+ PrintDebug("Capacity: %p\n", (void *)(addr_t)disk->capacity);
}
}
-static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct disk_state * disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
char * ip_str = v3_cfg_val(cfg, "IP");
char * port_str = v3_cfg_val(cfg, "port");
char * disk_tag = v3_cfg_val(cfg, "tag");
- char * name = v3_cfg_val(cfg, "name");
+ char * dev_id = v3_cfg_val(cfg, "ID");
v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
disk->ip_addr = v3_inet_addr(ip_str);
disk->port = atoi(port_str);
- struct vm_device * dev = v3_allocate_device(name, &dev_ops, disk);
+ struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, disk);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+ PrintError("Could not attach device %s\n", dev_id);
return -1;
}
if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"),
&blk_ops, frontend_cfg, disk) == -1) {
- PrintError("Could not connect %s to frontend\n", name);
+ PrintError("Could not connect %s to frontend\n", dev_id);
return -1;
}