From nobody Mon Feb 9 07:05:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565023143; cv=none; d=zoho.com; s=zohoarc; b=kSb6UPNLON5PoSPWswlATT+OmgWad//ym/4iFc+ULx/LOa4QVXZykNeIlWmCPLIwd/P4CSHr5STUBKIMGG7D4Zb8YQjhFf9kkQFSZ9XpgluCRcXE/C3VSTsNZ9vicigNRiCaQs3CWd4yz8E2nuf93TVABqAC4DO/tmDaNh6KiG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565023143; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=t8f0WmZ015RvUxLihuJSe2fHFYoqS7huEAaViCPryts=; b=BnvE/vMpeF3qiOB1XcYHCr7v/5sl07OGOt5tax93z5wX8q14Exp4gzePk5A7hkByd/wsx1aBMYmQv0rV0ceUh2Y6oknMHU1emf3l3gTaQU8zSY7LGqBNGWT30dxqILridhGeYELvaJPkcQN77gSdTDJJ1/y1/dxNVQvP/csJX08= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565023143845962.7813610023551; Mon, 5 Aug 2019 09:39:03 -0700 (PDT) Received: from localhost ([::1]:55950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hug0h-0007X9-Qh for importer@patchew.org; Mon, 05 Aug 2019 12:38:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37495) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hufzd-0005p8-Sb for qemu-devel@nongnu.org; Mon, 05 Aug 2019 12:37:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hufzd-0005vf-0E for qemu-devel@nongnu.org; Mon, 05 Aug 2019 12:37:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48118) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hufza-0005uh-Sw; Mon, 05 Aug 2019 12:37:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15AC930860CD; Mon, 5 Aug 2019 16:37:50 +0000 (UTC) Received: from localhost (unknown [10.40.205.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F6DF5D71C; Mon, 5 Aug 2019 16:37:49 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 5 Aug 2019 18:37:36 +0200 Message-Id: <20190805163740.23616-4-mreitz@redhat.com> In-Reply-To: <20190805163740.23616-1-mreitz@redhat.com> References: <20190805163740.23616-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 05 Aug 2019 16:37:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/7] util/hbitmap: update orig_size on truncate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Without this, hbitmap_next_zero and hbitmap_next_dirty_area are broken after truncate. So, orig_size is broken since it's introduction in 76d570dc495c56bb. Fixes: 76d570dc495c56bb Signed-off-by: Vladimir Sementsov-Ogievskiy Message-id: 20190805120120.23585-1-vsementsov@virtuozzo.com Reviewed-by: Max Reitz Signed-off-by: Max Reitz --- util/hbitmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/hbitmap.c b/util/hbitmap.c index 7905212a8b..bcc0acdc6a 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -53,7 +53,9 @@ */ =20 struct HBitmap { - /* Size of the bitmap, as requested in hbitmap_alloc. */ + /* + * Size of the bitmap, as requested in hbitmap_alloc or in hbitmap_tru= ncate. + */ uint64_t orig_size; =20 /* Number of total bits in the bottom level. */ @@ -732,6 +734,8 @@ void hbitmap_truncate(HBitmap *hb, uint64_t size) uint64_t num_elements =3D size; uint64_t old; =20 + hb->orig_size =3D size; + /* Size comes in as logical elements, adjust for granularity. */ size =3D (size + (1ULL << hb->granularity) - 1) >> hb->granularity; assert(size <=3D ((uint64_t)1 << HBITMAP_LOG_MAX_SIZE)); --=20 2.21.0