-static int disk_free(struct vm_device * dev) {
+static int disk_free(struct disk_state * disk) {
+ v3_file_close(disk->fd);
+
+ 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,
};
struct disk_state * disk = NULL;
char * path = v3_cfg_val(cfg, "path");
char * dev_id = v3_cfg_val(cfg, "ID");
-
char * writable = v3_cfg_val(cfg, "writable");
- char * readable = v3_cfg_val(cfg, "readable");
-
- int allowWrite = ( writable && writable[0] == '1' );
- int allowRead = ( !readable || readable[0] == '1' );
-
v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
+ int flags = FILE_OPEN_MODE_READ;
- disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
- memset(disk, 0, sizeof(struct disk_state));
-
+ if ( (writable) && (writable[0] == '1') ) {
+ flags |= FILE_OPEN_MODE_WRITE;
+ }
if (path == NULL) {
PrintError("Missing path (%s) for %s\n", path, dev_id);
return -1;
-
}
-
- if ( (allowRead == 1) && (allowWrite == 1) ) {
- disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE );
- } else if ( (allowRead == 1) && (allowWrite == 0) ) {
- disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_READ);
- } else if ( (allowRead == 0) && (allowWrite == 1) ) {
- disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_WRITE);
- } else {
- PrintError("Error on %s: No file mode specified\n", dev_id );
- return -1;
- }
-
- disk->capacity = v3_file_size(disk->fd);
+ disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
- PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n",
- dev_id, path, file->fd, file->capacity);
+ if (disk == NULL) {
+ PrintError("Could not allocate disk\n");
+ return -1;
+ }
- struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, disk);
+ memset(disk, 0, sizeof(struct disk_state));
- if (v3_attach_device(vm, dev) == -1) {
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, disk);
+ if (dev == NULL) {
PrintError("Could not attach device %s\n", dev_id);
+ V3_Free(disk);
return -1;
+ }
+
+ disk->fd = v3_file_open(vm, path, flags);
+
+ if (disk->fd == NULL) {
+ PrintError("Could not open file disk:%s\n", path);
+ v3_remove_device(dev);
+ return -1;
}
+ disk->capacity = v3_file_size(disk->fd);
+
+ PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n",
+ dev_id, path, file->fd, file->capacity);
+
+
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 %s\n",
dev_id, v3_cfg_val(frontend_cfg, "tag"));
+ v3_remove_device(dev);
return -1;
-
}