From nobody Sun Nov 2 11:43:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509282842673459.2584462558127; Sun, 29 Oct 2017 06:14:02 -0700 (PDT) Received: from localhost ([::1]:36360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8nPY-0005xh-QZ for importer@patchew.org; Sun, 29 Oct 2017 09:13:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8nLW-00039C-Ek for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:09:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8nLV-0001rj-8L for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:09:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e8nLV-0001q3-2Q for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:09:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EADE6A7CB for ; Sun, 29 Oct 2017 13:09:44 +0000 (UTC) Received: from secure.mitica (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id D55ED600C8; Sun, 29 Oct 2017 13:09:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3EADE6A7CB Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=quintela@redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Date: Sun, 29 Oct 2017 14:09:27 +0100 Message-Id: <20171029130934.4555-3-quintela@redhat.com> In-Reply-To: <20171029130934.4555-1-quintela@redhat.com> References: <20171029130934.4555-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sun, 29 Oct 2017 13:09:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/9] migration: Don't play games with the requested cache size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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; } =20 + if (new_size =3D=3D migrate_xbzrle_cache_size()) { + /* nothing to do */ + return new_size; + } + XBZRLE_cache_lock(); =20 if (XBZRLE.cache !=3D NULL) { - if (pow2floor(new_size) =3D=3D migrate_xbzrle_cache_size()) { - goto out_new_size; - } new_cache =3D cache_init(new_size, TARGET_PAGE_SIZE, errp); if (!new_cache) { ret =3D -1; @@ -152,8 +154,7 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **e= rrp) XBZRLE.cache =3D new_cache; } =20 -out_new_size: - ret =3D pow2floor(new_size); + ret =3D new_size; out: XBZRLE_cache_unlock(); return ret; --=20 2.13.6