OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: ram_release_pages() always receive 1 page as argument 

Remove the pages argument. And s/pages/page/

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>

---

- Use 1LL instead of casts (philmd)
- Change the whole 1ULL for TARGET_PAGE_SIZE
This commit is contained in:
Juan Quintela 2021-12-15 20:34:47 +01:00
parent 05931ec561
commit 0189c72291
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/ram.c
View File

@ -1204,13 +1204,13 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
return -1;
}
static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
static void ram_release_page(const char *rbname, uint64_t offset)
{
if (!migrate_release_ram() || !migration_in_postcopy()) {
return;
}
ram_discard_range(rbname, offset, ((ram_addr_t)pages) << TARGET_PAGE_BITS);
ram_discard_range(rbname, offset, TARGET_PAGE_SIZE);
}
/*
@ -1365,7 +1365,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
}
exit:
ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
return zero_page;
}
@ -2153,7 +2153,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)
xbzrle_cache_zero_page(rs, block->offset + offset);
XBZRLE_cache_unlock();
}
ram_release_pages(block->idstr, offset, res);
ram_release_page(block->idstr, offset);
return res;
}