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:
parent
05931ec561
commit
0189c72291
|
@ -1204,13 +1204,13 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
|
||||||
return -1;
|
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()) {
|
if (!migrate_release_ram() || !migration_in_postcopy()) {
|
||||||
return;
|
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:
|
exit:
|
||||||
ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
|
ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
|
||||||
return zero_page;
|
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_zero_page(rs, block->offset + offset);
|
||||||
XBZRLE_cache_unlock();
|
XBZRLE_cache_unlock();
|
||||||
}
|
}
|
||||||
ram_release_pages(block->idstr, offset, res);
|
ram_release_page(block->idstr, offset);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue