From 2a313e5cf6ed90b932b0abe2b4f2055785397f93 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 6 Oct 2017 23:00:12 +0200 Subject: migration: Don't play games with the requested cache size Now that we check that the value passed is a power of 2, we don't need to play games when comparing what is the size that is going to take the cache. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'migration/ram.c') diff --git a/migration/ram.c b/migration/ram.c index 7f6327f708..42f3b7cb28 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -136,12 +136,14 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) return -1; } + if (new_size == migrate_xbzrle_cache_size()) { + /* nothing to do */ + return new_size; + } + XBZRLE_cache_lock(); if (XBZRLE.cache != NULL) { - if (pow2floor(new_size) == migrate_xbzrle_cache_size()) { - goto out_new_size; - } new_cache = cache_init(new_size, TARGET_PAGE_SIZE, errp); if (!new_cache) { ret = -1; @@ -152,8 +154,7 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) XBZRLE.cache = new_cache; } -out_new_size: - ret = pow2floor(new_size); + ret = new_size; out: XBZRLE_cache_unlock(); return ret; -- cgit v1.2.3