X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=829252ad6054760ecbfc47db18a077617c2feb80;hb=fbfbbc1eec7587e4555e7920c9b15129f90f8d80;hp=278b234dbe57887396e74eadc295f7b32ea5edb3;hpb=0e29a343765b225251f5634fb34aa6a60085a0bd;p=palacios.releases.git

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index 278b234..829252a 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,12 +31,12 @@
 struct disk_state {
     uint64_t capacity; // in bytes
 
-    int fd;
+    void * fd;
 };
 
 
 
-static int write_all(int fd, char * buf, int offset, int length) {
+static int write_all(void * fd, char * buf, int offset, int length) {
     int bytes_written = 0;
     
     PrintDebug("Writing %d bytes\n", length - bytes_written);
@@ -55,7 +56,7 @@ static int write_all(int fd, char * buf, int offset, int length) {
 }
 
 
-static int read_all(int fd, char * buf, int offset, int length) {
+static int read_all(void * fd, char * buf, int offset, int length) {
     int bytes_read = 0;
     
     PrintDebug("Reading %d bytes\n", length - bytes_read);
@@ -124,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");
 
@@ -137,30 +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;
+
+    }
+    
+    if ( (allowRead == 1) && (allowWrite == 1) ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE, vm->host_priv_data );
+    } else if ( (allowRead == 1) && (allowWrite == 0) ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ, vm->host_priv_data );
+    } else if ( (allowRead == 0) && (allowWrite == 1) ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_WRITE, vm->host_priv_data );
+    } else {
+    	PrintError("Error on %s: No file mode specified\n", dev_id );
+    	return -1;
+
     }
     
-    disk->fd = V3_FileOpen(path, 0);
     disk->capacity = V3_FileSize(disk->fd);
 
     PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n",
-	       name, path, file->fd, file->capacity);
+	       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;
+
     }