From c9dede2d482676440cb6e826ebe87450965fe679 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 6 Oct 2017 23:03:55 +0200 Subject: migration: No need to return the size of the cache After the previous commits, we make sure that the value passed is right, or we just drop an error. So now we return if there is one error or we have setup correctly the value passed. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert -- Improve error messasge Return 0 always for success --- migration/ram.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'migration/ram.c') diff --git a/migration/ram.c b/migration/ram.c index 42f3b7cb28..997340c7c2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -112,15 +112,15 @@ static void XBZRLE_cache_unlock(void) * migration may be using the cache and might finish during this call, * hence changes to the cache are protected by XBZRLE.lock(). * - * Returns the new_size or negative in case of error. + * Returns 0 for success or -1 for error * * @new_size: new cache size * @errp: set *errp if the check failed, with reason */ -int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) +int xbzrle_cache_resize(int64_t new_size, Error **errp) { PageCache *new_cache; - int64_t ret; + int64_t ret = 0; /* Check for truncation */ if (new_size != (size_t)new_size) { @@ -138,7 +138,7 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) if (new_size == migrate_xbzrle_cache_size()) { /* nothing to do */ - return new_size; + return 0; } XBZRLE_cache_lock(); @@ -153,8 +153,6 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) cache_fini(XBZRLE.cache); XBZRLE.cache = new_cache; } - - ret = new_size; out: XBZRLE_cache_unlock(); return ret; -- cgit v1.2.1