#include <palacios/vmm.h>
#include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_file.h>
+#include <interfaces/vmm_file.h>
+#include <palacios/vm_guest.h>
-#ifndef CONFIG_DEBUG_FILEDISK
+#ifndef V3_CONFIG_DEBUG_FILEDISK
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
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 ) {
}
-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) {
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);
}
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);
}
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;
-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,
};
-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 = NULL;
char * path = v3_cfg_val(cfg, "path");
-
char * dev_id = v3_cfg_val(cfg, "ID");
- char * filename = v3_cfg_val(cfg, "file");
-
-
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 (!path) {
-
+ 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 && 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", name );
- return -1;
- }
-
- disk->capacity = V3_FileSize(disk->fd);
+ disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
- PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n",
- name, 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;
-
}
