From nobody Sun Feb 8 21:48:33 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; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1572128816; cv=none; d=zoho.com; s=zohoarc; b=BDFVbmD6fxhZdrfATgJe6bxMLOOFTZWliAhU7is3OylHQhReB+33HXAGLEviv4MlwThBvTx4qTVKzWF9RSIkZkJ5+puqa5uCix7StvZiKHQCZfaGJ17yZGRvlt0XX/v3w0tMGg5ZG+GSN1mGlPUP3LYh+e8vRu45sFi3fUvu9RU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572128816; 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=JRoZMYOKHXsp3/0CS1YG5TDx/OhWsX+AkPTx4RJXlxA=; b=RgnOa/c/B45ILc+zOg9H5GexLXzmVdJei6AiDilsa2wCyn6vKwTUrJDpaR5H06p3o7MF6EaQ3jQ7zoka+yju6gmnuN9S6p1xdCybU6SpZQHVuduQPHcHEt2b3UPOocNp4C2lrdSxS5IajVBi8DEk0b/AIdF6rIvMErMsouS0Ux0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572128816672117.19689153539741; Sat, 26 Oct 2019 15:26:56 -0700 (PDT) Received: from localhost ([::1]:43154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOUWN-0004ij-Kg for importer@patchew.org; Sat, 26 Oct 2019 18:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60045) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOTZj-00005V-Kf for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iOTZi-0005Lz-DB for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:19 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iOTZg-0005Eu-9C; Sat, 26 Oct 2019 17:26:16 -0400 Received: from 87-100-137-117.bb.dnainternet.fi ([87.100.137.117] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iOTZI-00045w-MR; Sat, 26 Oct 2019 23:25:52 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iOTZ0-0001PK-FK; Sun, 27 Oct 2019 00:25:34 +0300 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=JRoZMYOKHXsp3/0CS1YG5TDx/OhWsX+AkPTx4RJXlxA=; b=aZbpVYmvZbDaxwAQpmvVucV8WnSbUoNwwnCFl+SZ7xh0pbianyZbfZz375Ry0d8zCxXkNyqBh+RrO0PdUOWywSw3eKKgFPOJXEeZ+Umv4vYCcxnFjpfIJAyJjxWHpjnuo8EF5c8in+Vh61UlwczRMGcLoQHkjs5w48rtmI8e7vsa8M7WVXsizo4i6yjEuzs6Z8U9JNo8Sfv7ubsyXu+RkiMUVot5jatQkmnboQcsydHd4etwfXIbKi9Ik3IExGMd4+6mUkz+QGnOVpVcuM6381FLH8qNEsHfNkkM+zRkmWz6GjC1ItWi9eYmfBDM570uXjauCoEB364i2lMuTHNmmw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 10/26] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Date: Sun, 27 Oct 2019 00:25:12 +0300 Message-Id: <2d4de1dee301cd772fce97c90e08a390edbe2830.1572125022.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, these functions are no-ops when used in traditional qcow2 images. Signed-off-by: Alberto Garcia --- block/qcow2.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index 29a253bfb9..741c41c80f 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -507,15 +507,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 { + 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) +{ + if (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