X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=bf1aaf852dee15115e73b531bf74d55219d8b7b9;hb=a78284b06acb02600e70abe4bb5288b8c2fbf253;hp=ebaaaad1bc2ff5250c9933ae59380939f8146931;hpb=acef389a3165a636b80a2efbd41f86c0226be78d;p=palacios.git diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c index ebaaaad..bf1aaf8 100644 --- a/palacios/src/devices/filedisk.c +++ b/palacios/src/devices/filedisk.c @@ -20,9 +20,10 @@ #include #include -#include +#include +#include -#ifndef CONFIG_DEBUG_FILEDISK +#ifndef V3_CONFIG_DEBUG_FILEDISK #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -30,17 +31,17 @@ struct disk_state { uint64_t capacity; // in bytes - int fd; + v3_file_t fd; }; -static int write_all(int fd, char * buf, int offset, int length) { +static int write_all(v3_file_t fd, char * buf, int offset, int length) { int bytes_written = 0; PrintDebug("Writing %d bytes\n", length - bytes_written); while (bytes_written < length) { - int tmp_bytes = V3_FileWrite(fd, offset+bytes_written, buf + bytes_written, length - bytes_written); + int tmp_bytes = v3_file_write(fd, buf + bytes_written, length - bytes_written, offset + bytes_written); PrintDebug("Wrote %d bytes\n", tmp_bytes); if (tmp_bytes <= 0 ) { @@ -55,12 +56,12 @@ static int write_all(int fd, char * buf, int offset, int length) { } -static int read_all(int fd, char * buf, int offset, int length) { +static int read_all(v3_file_t fd, char * buf, int offset, int length) { int bytes_read = 0; PrintDebug("Reading %d bytes\n", length - bytes_read); while (bytes_read < length) { - int tmp_bytes = V3_FileRead(fd, offset+bytes_read, buf + bytes_read, length - bytes_read); + int tmp_bytes = v3_file_read(fd, buf + bytes_read, length - bytes_read, offset + bytes_read); PrintDebug("Read %d bytes\n", tmp_bytes); if (tmp_bytes <= 0) { @@ -79,6 +80,12 @@ static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_ PrintDebug("Reading %d bytes from %p to %p\n", (uint32_t)num_bytes, (uint8_t *)(disk->disk_image + lba), buf); + if (lba + num_bytes > disk->capacity) { + PrintError("Out of bounds read: lba=%llu, num_bytes=%llu, capacity=%llu\n", + lba, num_bytes, disk->capacity); + return -1; + } + return read_all(disk->fd, buf, lba, num_bytes); } @@ -88,6 +95,13 @@ static int write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private PrintDebug("Writing %d bytes from %p to %p\n", (uint32_t)num_bytes, buf, (uint8_t *)(disk->disk_image + lba)); + if (lba + num_bytes > disk->capacity) { + PrintError("Out of bounds read: lba=%llu, num_bytes=%llu, capacity=%llu\n", + lba, num_bytes, disk->capacity); + return -1; + } + + return write_all(disk->fd, buf, lba, num_bytes); } @@ -95,7 +109,7 @@ static int write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private static uint64_t get_capacity(void * private_data) { struct disk_state * disk = (struct disk_state *)private_data; - PrintDebug("Querying RAMDISK capacity %d\n", + PrintDebug("Querying FILEDISK capacity %d\n", (uint32_t)(disk->capacity)); return disk->capacity; @@ -110,15 +124,15 @@ static struct v3_dev_blk_ops blk_ops = { -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, }; @@ -127,64 +141,58 @@ static struct v3_device_ops dev_ops = { static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { 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"); + v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); + int flags = FILE_OPEN_MODE_READ; + 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; + } - 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' ); + disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state)); - v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); + if (disk == NULL) { + PrintError("Could not allocate disk\n"); + return -1; + } - disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state)); memset(disk, 0, sizeof(struct disk_state)); + 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; + } - if (!path) { + disk->fd = v3_file_open(vm, path, flags); - PrintError("Missing path (%s) for %s\n", path, dev_id); + if (disk->fd == NULL) { + PrintError("Could not open file disk:%s\n", path); + v3_remove_device(dev); return -1; - } - - if ( allowRead && allowWrite ) { - disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE ); - } else if ( allowRead && !allowWrite ) { - disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ ); - } else if ( !allowRead && allowWrite ) { - disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_WRITE ); - } else { - PrintError("Error on %s: No file mode specified\n", dev_id ); - return -1; - } - - disk->capacity = V3_FileSize(disk->fd); + 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); - 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", 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 %s\n", dev_id, v3_cfg_val(frontend_cfg, "tag")); + v3_remove_device(dev); return -1; - }