-static int disk_free(struct vm_device * dev) {
+static int disk_free(struct disk_state * disk) {
+
+ v3_socket_close(disk->socket);
+
+ V3_Free(disk);
return 0;
}
static struct v3_device_ops dev_ops = {
- .free = disk_free,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ .free = (int (*)(void *))disk_free,
};
disk->socket = v3_create_tcp_socket(disk->vm);
- PrintDebug("DISK socket: %d\n", disk->socket);
+ PrintDebug("DISK socket: %p\n", disk->socket);
PrintDebug("Connecting to: %s:%d\n", v3_inet_ntoa(disk->ip_addr), disk->port);
v3_connect_to_ip(disk->socket, v3_ntohl(disk->ip_addr), disk->port);
disk->port = atoi(port_str);
disk->vm = vm;
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, disk);
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, disk);
- if (v3_attach_device(vm, dev) == -1) {
+ if (dev == NULL) {
PrintError("Could not attach device %s\n", dev_id);
+ V3_Free(disk);
return -1;
}
if (socket_init(disk) == -1) {
PrintError("could not initialize network connection\n");
+ v3_remove_device(dev);
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", dev_id);
+ v3_remove_device(dev);
return -1;
}