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

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index 829252a..b007ace 100644
--- a/palacios/src/devices/filedisk.c
+++ b/palacios/src/devices/filedisk.c
@@ -31,17 +31,17 @@
 struct disk_state {
     uint64_t capacity; // in bytes
 
-    void * fd;
+    v3_file_t fd;
 };
 
 
 
-static int write_all(void * fd, char * buf, int offset, int length) {
+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_FileWrite(fd, offset+bytes_written, buf + bytes_written, length - bytes_written);
+	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 ) {
@@ -56,12 +56,12 @@ static int write_all(void * fd, char * buf, int offset, int length) {
 }
 
 
-static int read_all(void * 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;
     
     PrintDebug("Reading %d bytes\n", length - bytes_read);
     while (bytes_read < length) {
-	int tmp_bytes = V3_FileRead(fd, offset+bytes_read, buf + bytes_read, length - bytes_read);
+	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) {
@@ -111,15 +111,15 @@ static struct v3_dev_blk_ops blk_ops = {
 
 
 
-static int disk_free(struct vm_device * dev) {
+static int disk_free(struct disk_state * disk) {
+    v3_file_close(disk->fd);
+    
+    V3_Free(disk);
     return 0;
 }
 
 static struct v3_device_ops dev_ops = {
-    .free = disk_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))disk_free,
 };
 
 
@@ -129,58 +129,57 @@ 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 * 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");
+    int flags = FILE_OPEN_MODE_READ;
 
-    disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
-    memset(disk, 0, sizeof(struct disk_state));
-
+    if ( (writable) && (writable[0] == '1') ) {
+	flags |= FILE_OPEN_MODE_WRITE;
+    }
 
     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->capacity = V3_FileSize(disk->fd);
+    disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state));
 
-    PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n",
-	       dev_id, path, file->fd, file->capacity);
+    if (disk == NULL) {
+	PrintError("Could not allocate disk\n");
+	return -1;
+    }
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, disk);
+    memset(disk, 0, sizeof(struct disk_state));
 
-    if (v3_attach_device(vm, dev) == -1) {
+    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_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);
+
+
     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_remove_device(dev);
 	return -1;
-
     }