#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
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) {
- struct disk_state * disk = dev->private_data;
-
+static int disk_free(struct disk_state * disk) {
v3_file_close(disk->fd);
V3_Free(disk);
}
static struct v3_device_ops dev_ops = {
- .free = disk_free,
+ .free = (int (*)(void *))disk_free,
};
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;
+ }
+
+
disk->fd = v3_file_open(vm, path, flags);
if (disk->fd == NULL) {
PrintError("Could not open file disk:%s\n", path);
- V3_Free(disk);
+ v3_remove_device(dev);
return -1;
}
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);
- v3_file_close(disk->fd);
- V3_Free(disk);
- 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_file_close(disk->fd);
- V3_Free(disk);
+ v3_remove_device(dev);
return -1;
}