@@ -2357,7 +2357,7 @@ static long gethugepagesize(const char *path)
}
static void *file_ram_alloc(RAMBlock *block,
- ram_addr_t memory,
+ size_t length,
const char *path)
{
gchar *filename;
@@ -2373,7 +2373,7 @@ static void *file_ram_alloc(RAMBlock *block,
return NULL;
}
- if (memory < hpagesize) {
+ if (length < hpagesize) {
return NULL;
}
@@ -2392,7 +2392,7 @@ static void *file_ram_alloc(RAMBlock *block,
unlink(filename);
g_free(filename);
- memory = (memory + hpagesize - 1) & ~(hpagesize - 1);
+ length = (length + hpagesize - 1) & ~(hpagesize - 1);
/*
* ftruncate is not supported by hugetlbfs in older
@@ -2400,7 +2400,7 @@ static void *file_ram_alloc(RAMBlock *block,
* If anything goes wrong with it under other filesystems,
* mmap will fail.
*/
- if (ftruncate(fd, memory)) {
+ if (ftruncate(fd, length)) {
perror("ftruncate");
}
@@ -2410,9 +2410,9 @@ static void *file_ram_alloc(RAMBlock *block,
* to sidestep this quirk.
*/
flags = mem_prealloc ? MAP_POPULATE | MAP_SHARED : MAP_PRIVATE;
- area = mmap(0, memory, PROT_READ | PROT_WRITE, flags, fd, 0);
+ area = mmap(0, length, PROT_READ | PROT_WRITE, flags, fd, 0);
#else
- area = mmap(0, memory, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+ area = mmap(0, length, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
#endif
if (area == MAP_FAILED) {
perror("file_ram_alloc: can't mmap RAM pages");
While we are at it, rename it to "length", as "memory" doesn't mean anything. Changes v1 -> v2: - Rebase after coding style changes Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- exec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)