From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7EYe-0000sx-Pb for qemu-devel@nongnu.org; Wed, 25 Oct 2017 01:48:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7EYd-0004SQ-Ug for qemu-devel@nongnu.org; Wed, 25 Oct 2017 01:48:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52684) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7EYd-0004SC-OY for qemu-devel@nongnu.org; Wed, 25 Oct 2017 01:48:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B27A883A0 for ; Wed, 25 Oct 2017 05:48:50 +0000 (UTC) From: Juan Quintela Date: Wed, 25 Oct 2017 07:48:39 +0200 Message-Id: <20171025054842.24883-3-quintela@redhat.com> In-Reply-To: <20171025054842.24883-1-quintela@redhat.com> References: <20171025054842.24883-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v3 2/5] migration: Don't play games with the requested cache size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com 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(-) 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; -- 2.13.6