X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=9625d3b2be350f3908f10c91dd493c683042fc0e;hb=ffd6d915b585a4a17a2d5b081313f0968885a105;hp=c0122cd1ee8877d173718682aa7fce1ceb4c4d72;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios.git

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index c0122cd..9625d3b 100644
--- a/palacios/src/devices/filedisk.c
+++ b/palacios/src/devices/filedisk.c
@@ -20,10 +20,10 @@
 #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
@@ -36,10 +36,10 @@ struct disk_state {
 
 
 
-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);
@@ -56,10 +56,10 @@ static int write_all(v3_file_t 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;
+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);
@@ -78,7 +78,13 @@ static int read_all(v3_file_t fd, char * buf, int offset, int length) {
 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);
 }
@@ -87,7 +93,14 @@ static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_
 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);
 }
@@ -96,8 +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", 
-	       (uint32_t)(disk->capacity));
+    PrintDebug("Querying FILEDISK capacity %llu\n", disk->capacity);
 
     return disk->capacity;
 }
@@ -111,9 +123,7 @@ static struct v3_dev_blk_ops blk_ops = {
 
 
 
-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);
@@ -121,7 +131,7 @@ static int disk_free(struct vm_device * dev) {
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = disk_free,
+    .free = (int (*)(void *))disk_free,
 };
 
 
@@ -153,34 +163,34 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     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;
     }
 
     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);
 
-    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;
     }