X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=44ec18c33eb64f311acd360b0a5d9c603b92219f;hb=dadac9c02898a50c7c128d4bbcef39a0e339aa8c;hp=ebaaaad1bc2ff5250c9933ae59380939f8146931;hpb=acef389a3165a636b80a2efbd41f86c0226be78d;p=palacios-OLD.git

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index ebaaaad..44ec18c 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,17 +31,17 @@
 struct disk_state {
     uint64_t capacity; // in bytes
 
-    int fd;
+    v3_file_t fd;
 };
 
 
 
-static int write_all(int 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, offset + bytes_written, length - bytes_written);
 	PrintDebug("Wrote %d bytes\n", tmp_bytes);
 	
 	if (tmp_bytes <= 0 ) {
@@ -55,12 +56,12 @@ 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(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, offset + bytes_read, length - bytes_read);
 	PrintDebug("Read %d bytes\n", tmp_bytes);
 	
 	if (tmp_bytes <= 0) {
@@ -127,11 +128,8 @@ static struct v3_device_ops dev_ops = {
 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");
     
@@ -144,27 +142,25 @@ static int disk_init(struct v3_vm_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 && 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 );
+    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;
 
     }
     
-    disk->capacity = V3_FileSize(disk->fd);
+    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);