Skip to content

Commit

Permalink
migration: Don't play games with the requested cache size
Browse files Browse the repository at this point in the history
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 <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  • Loading branch information
Juan Quintela committed Oct 29, 2017
1 parent bab01ed commit 2a313e5
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions migration/ram.c
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 2a313e5

Please sign in to comment.