From nobody Mon Feb 9 10:51:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1594398175; cv=none; d=zohomail.com; s=zohoarc; b=RqL45Cdf5NitkyQAHKpEPUpdqphCbEw/fZug++GCELmG0462A8K6Rhb/+h/OW0cUPAkwM81+wRynZ5PoyDKqPcnwQyDY+rZ8NyxY03T08215/MmXe7FUpIzAtemmawBpJBUUlI7Bmap9q0BxQIs6B/T1oWCnduPhGJ/kvhEtqts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594398175; 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; bh=NffIPXJloXWWlD+xGb+afY3hYVnDQCqp8jgOvTFIJ3M=; b=A/K+eh2dT5LZrMeZvGbgOThf+HbE5V71/sFViugIakpIlUocqasnuYVF1PpGAAOkKacsNZ/aCDGeL9q+Z+YWArBA8Ue/8kqrawRxLnFFs7moZUgzN2mx3gcq37qUGrKVYbbO1Dqv5nWEXzeljToa49ST5WGAwdXdUTdhcC/LG88= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159439817532639.4251982835209; Fri, 10 Jul 2020 09:22:55 -0700 (PDT) Received: from localhost ([::1]:54178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtvna-0001zV-3z for importer@patchew.org; Fri, 10 Jul 2020 12:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtvf5-0002Gv-V5; Fri, 10 Jul 2020 12:14:07 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:43607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtvex-0004vJ-QN; Fri, 10 Jul 2020 12:14:07 -0400 Received: from [81.0.43.0] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jtvea-0003jg-5w; Fri, 10 Jul 2020 18:13:36 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jtveK-0001Qe-Vu; Fri, 10 Jul 2020 18:13:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=NffIPXJloXWWlD+xGb+afY3hYVnDQCqp8jgOvTFIJ3M=; b=qTdQ1tcr+xeIsYaZhiBNvMLZNEJ/epSY7Nw8JJcI5z5zDGMi2uNP78xvJZzmtOarFcmqQnERIox5vDLTcERQjelTvjnNOXF0vtxTzwx1EwUiOt4M3HRhaMmMv0HeO0/0JfEvvdc/Lz77UILd8wZs7/CXlBnBnfNeB2CXnVlCvS96Yvc7Bh255T+Z2HF3V1HvMFcPkE2U4isTjN9ujGDyILJmH+2CEKXTo6ZMxaDMKGJ9uYJ4wLF0O61YDgWVXJTRiPxzXtSrCUUJpwxQ3WBtuLwEOMDZcaKZdRPU5sZ8gpj+Fo2Lz6lOxkPM4xRfeLf/gl/Yo+5oqHpiSTLIYpiPHg==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v11 13/34] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Date: Fri, 10 Jul 2020 18:12:55 +0200 Message-Id: <6ee0f81ae3329c991de125618b3675e1e46acdbb.1594396418.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/10 12:13:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Extended L2 entries are 128-bit wide: 64 bits for the entry itself and 64 bits for the subcluster allocation bitmap. In order to support them correctly get/set_l2_entry() need to be updated so they take the entry width into account in order to calculate the correct offset. This patch also adds the get/set_l2_bitmap() functions that are used to access the bitmaps. For convenience we allow calling get_l2_bitmap() on images without subclusters. In this case the returned value is always 0 and has no meaning. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index 46b351229a..82b86f6cec 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -533,15 +533,36 @@ static inline size_t l2_entry_size(BDRVQcow2State *s) static inline uint64_t get_l2_entry(BDRVQcow2State *s, uint64_t *l2_slice, int idx) { + idx *=3D l2_entry_size(s) / sizeof(uint64_t); return be64_to_cpu(l2_slice[idx]); } =20 +static inline uint64_t get_l2_bitmap(BDRVQcow2State *s, uint64_t *l2_slice, + int idx) +{ + if (has_subclusters(s)) { + idx *=3D l2_entry_size(s) / sizeof(uint64_t); + return be64_to_cpu(l2_slice[idx + 1]); + } else { + return 0; /* For convenience only; this value has no meaning. */ + } +} + static inline void set_l2_entry(BDRVQcow2State *s, uint64_t *l2_slice, int idx, uint64_t entry) { + idx *=3D l2_entry_size(s) / sizeof(uint64_t); l2_slice[idx] =3D cpu_to_be64(entry); } =20 +static inline void set_l2_bitmap(BDRVQcow2State *s, uint64_t *l2_slice, + int idx, uint64_t bitmap) +{ + assert(has_subclusters(s)); + idx *=3D l2_entry_size(s) / sizeof(uint64_t); + l2_slice[idx + 1] =3D cpu_to_be64(bitmap); +} + static inline bool has_data_file(BlockDriverState *bs) { BDRVQcow2State *s =3D bs->opaque; --=20 2.20.1