#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
-static int write_all(v3_file_t fd, char * buf, int offset, int length) {
- int bytes_written = 0;
+static int write_all(v3_file_t fd, char * buf, uint64_t offset, uint64_t length) {
+ uint64_t bytes_written = 0;
- PrintDebug("Writing %d bytes\n", length - bytes_written);
+ PrintDebug("Writing %llu bytes\n", length - bytes_written);
while (bytes_written < length) {
int tmp_bytes = v3_file_write(fd, buf + bytes_written, length - bytes_written, offset + bytes_written);
PrintDebug("Wrote %d bytes\n", tmp_bytes);
}
-static int read_all(v3_file_t fd, char * buf, int offset, int length) {
- int bytes_read = 0;
+static int read_all(v3_file_t fd, char * buf, uint64_t offset, uint64_t length) {
+ uint64_t bytes_read = 0;
- PrintDebug("Reading %d bytes\n", length - bytes_read);
+ PrintDebug("Reading %llu bytes\n", length - bytes_read);
while (bytes_read < length) {
int tmp_bytes = v3_file_read(fd, buf + bytes_read, length - bytes_read, offset + bytes_read);
PrintDebug("Read %d bytes\n", tmp_bytes);
static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) {
struct disk_state * disk = (struct disk_state *)private_data;
- PrintDebug("Reading %d bytes from %p to %p\n", (uint32_t)num_bytes, (uint8_t *)(disk->disk_image + lba), buf);
+ PrintDebug("Reading %llu bytes from %p to %p\n", 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);
}
static int write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) {
struct disk_state * disk = (struct disk_state *)private_data;
- PrintDebug("Writing %d bytes from %p to %p\n", (uint32_t)num_bytes, buf, (uint8_t *)(disk->disk_image + lba));
+ PrintDebug("Writing %llu bytes from %p to %p\n", 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",
- (uint32_t)(disk->capacity));
+ PrintDebug("Querying FILEDISK capacity %llu\n", 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,
};
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);
+ V3_Print("Registering FILEDISK %s (path=%s, fd=%lu, size=%llu)\n",
+ dev_id, path, (addr_t)disk->fd, disk->capacity);
if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"),