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

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index 278b234..ebaaaad 100644
--- a/palacios/src/devices/filedisk.c
+++ b/palacios/src/devices/filedisk.c
@@ -124,13 +124,20 @@ 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");
 
     disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
@@ -139,28 +146,45 @@ static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
 
     if (!path) {
 
+
 	PrintError("Missing path (%s) for %s\n", path, dev_id);
 	return -1;
+
+    }
+    
+    if ( allowRead && allowWrite ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ | FILE_OPEN_MODE_WRITE );
+    } else if ( allowRead && !allowWrite ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_READ );
+    } else if ( !allowRead && allowWrite ) {
+    	disk->fd = V3_FileOpen(path, FILE_OPEN_MODE_WRITE );
+    } 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;
+
     }