From nobody Mon Feb 9 05:13:58 2026 Delivered-To: importer@patchew.org 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; 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=1577014957; cv=none; d=zohomail.com; s=zohoarc; b=UKq3M763Ze7PE7SmX+5/5ZQBvy+1vYiYJe474VeDaHFGEJRpGNqM9xAT3YmOlWgU2Bsnz+oafhV+PNWZjoYjDlxDcDd/0GJyuyXwqHWopPFyUENRR1Qyj/fkGw3eQKVgvsaqsPVAF8ZoWEOZqxYnD1lfjirS1PRTb2Bq5kGuekU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577014957; 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=ju9m1bHZwrBhmoBOR8wUG6o2CitZFGgTqc+m8uLXTAo=; b=RFgipbpCSlv8ZvdVA0rt/ij1oAkOEt5+mAr84+TBtCtRZf4Uu4DSIou5PrhEFufLxCzmFpip+LHYgEP0bMx9xtc/jPGqmv/CZg05CH6TyM38LrxJhGIRNy40mBdaw9AiWtotIl38NDSAI6lpSi2NISTtOAOjJVvsCok8WNO0PHw= 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 1577014957039753.7574466434914; Sun, 22 Dec 2019 03:42:37 -0800 (PST) Received: from localhost ([::1]:46664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iizd5-0008Bt-R7 for importer@patchew.org; Sun, 22 Dec 2019 06:42:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iizYp-0002o0-P1 for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iizYo-0005cI-4s for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:11 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:34979) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iizYn-0004V0-Df; Sun, 22 Dec 2019 06:38:09 -0500 Received: from [80.30.182.172] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iizYU-0005dC-M2; Sun, 22 Dec 2019 12:37:51 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iizXu-0001Vm-H3; Sun, 22 Dec 2019 12:37:14 +0100 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=ju9m1bHZwrBhmoBOR8wUG6o2CitZFGgTqc+m8uLXTAo=; b=bOmmmXNk7vR4LVuGDGs7+YyG3PZbYplNpBKwodCDMSpht5NqnR5TxziEZp+6uz82R0dBDHuGUMqVAjyrg1fLxyj8K5xbMq/B1+qHZE1ddvzjL0Ea4zoilUwmfgtVlR3Qz40f+bUA1jH5nbfNj91b22ivD/m25JiNlHwAKaUnod9Bb8VEEb3RwfD/CdzaGXXmL/ar4WaITiajdETIgNK82ttcdmcx4HNGKo6UctX0Zqk/7PzwC1qc8sKdP3T9JlOTHQZeu+Fea6QSUGHnN5okJ7pY7p+qLPCqx2wXlKVOB9fNsF9fbO9reYL82rtYqztBCqW2BR+6eKCXBoHahiW8Aw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v3 10/27] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Date: Sun, 22 Dec 2019 12:36:51 +0100 Message-Id: <0229eca3c5199c5383b640f9a041a83ddfcf5b0c.1577014346.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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 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 , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , "Denis V . Lunev" 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, although the caller does not need and should ignore the returned value. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/qcow2.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index 8be020bb76..64b0a814f4 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -518,15 +518,37 @@ 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 { + /* For convenience only; the caller should ignore this value. */ + return 0; + } +} + 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