X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=f4e6318f6b14b7067e130ad93a5c6c5722e193b6;hb=1df601c90b519a54b64ca101fd6aa4c0a39bf0f0;hp=6e9e5d7654c6410e7ace32d50a6d02ccf2fd5f7c;hpb=e5e029575affad90c19ca038a3b780820535d421;p=palacios.git

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index 6e9e5d7..f4e6318 100644
--- a/palacios/src/devices/filedisk.c
+++ b/palacios/src/devices/filedisk.c
@@ -21,6 +21,7 @@
 #include <palacios/vmm_dev_mgr.h>
 
 #include <palacios/vmm_file.h>
+#include <palacios/vm_guest.h>
 
 #ifndef CONFIG_DEBUG_FILEDISK
 #undef PrintDebug
@@ -30,18 +31,56 @@
 struct disk_state {
     uint64_t capacity; // in bytes
 
-    int fd;
+    v3_file_t fd;
 };
 
 
+
+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_file_write(fd, buf + bytes_written, length - bytes_written, offset + bytes_written);
+	PrintDebug("Wrote %d bytes\n", tmp_bytes);
+	
+	if (tmp_bytes <= 0 ) {
+	    PrintError("Write failed\n");
+	    return -1;
+	}
+	
+	bytes_written += tmp_bytes;
+    }
+    
+    return 0;
+}
+
+
+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_file_read(fd, buf + bytes_read, length - bytes_read, offset + bytes_read);
+	PrintDebug("Read %d bytes\n", tmp_bytes);
+	
+	if (tmp_bytes <= 0) {
+	    PrintError("Read failed\n");
+	    return -1;
+	}
+	
+	bytes_read += tmp_bytes;
+    }
+    
+    return 0;
+}
+
 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);
 
-    V3_FileRead(disk->fd, lba, buf, num_bytes);
-
-    return 0;
+    return read_all(disk->fd, buf, lba, num_bytes);
 }
 
 
@@ -50,9 +89,7 @@ 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));
 
-    V3_FileWrite(disk->fd, lba, buf, num_bytes);
-
-    return 0;
+    return write_all(disk->fd,  buf, lba, num_bytes);
 }
 
 
@@ -88,12 +125,16 @@ static struct v3_device_ops dev_ops = {
 
 
 
-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");
 
@@ -101,29 +142,45 @@ static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     memset(disk, 0, sizeof(struct disk_state));
 
 
-    if (!path) {
+    if (path == NULL) {
 	PrintError("Missing path (%s) for %s\n", path, dev_id);
 	return -1;
+
     }
     
-    disk->fd = V3_FileOpen(path, 0);
-    disk->capacity = V3_FileSize(disk->fd);
+    if ( (allowRead == 1) && (allowWrite == 1) ) {
+    	disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE );
+    } else if ( (allowRead == 1) && (allowWrite == 0) ) {
+    	disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_READ);
+    } else if ( (allowRead == 0) && (allowWrite == 1) ) {
+    	disk->fd = v3_file_open(vm, path, FILE_OPEN_MODE_WRITE);
+    } else {
+    	PrintError("Error on %s: No file mode specified\n", dev_id );
+    	return -1;
 
-    PrintDebug("Registering RAMDISK at %p (size=%d)\n", 
-	       (void *)file->data, (uint32_t)file->size);
+    }
+    
+    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"));
 	return -1;
+
     }