Integrated vmm_file and filedisk - now compiles

diff --git a/palacios/include/palacios/vmm_file.h b/palacios/include/palacios/vmm_file.h
index ea8dd97..20718c3 100644 (file)
--- a/palacios/include/palacios/vmm_file.h
+++ b/palacios/include/palacios/vmm_file.h
@@ -51,14 +51,14 @@
     ({                                                                 \
        extern struct v3_file_hooks *file_hooks;                                \
        ((file_hooks) && (file_hooks)->file_read) ?                             \
-           (file_hooks)->file_read((fd),(start),(buf),(length)) : -1 ;  \
+           (file_hooks)->file_read((fd),(start),(buf),(len)) : -1 ;  \
     })
 
 #define V3_FileWrite(fd,start,buf,len)                                 \
     ({                                                                 \
        extern struct v3_file_hooks *file_hooks;                                \
        ((file_hooks) && (file_hooks)->file_write) ?                            \
-           (file_hooks)->file_write((fd),(start),(buf),(length)) : -1 ;  \
+           (file_hooks)->file_write((fd),(start),(buf),(len)) : -1 ;  \
     })
 
 

diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c
index 3c6e573..d58c30f 100644 (file)
--- a/palacios/src/devices/filedisk.c
+++ b/palacios/src/devices/filedisk.c
@@ -90,7 +90,6 @@ static struct v3_device_ops dev_ops = {
 
 static int disk_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct disk_state * disk = NULL;
-    struct v3_cfg_file * file = NULL;
     char * name = v3_cfg_val(cfg, "filename");
     char * filename = v3_cfg_val(cfg, "file");