From nobody Mon Feb 9 09:23:04 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=1571153225; cv=none; d=zoho.com; s=zohoarc; b=KtaFiPYz53Fg2NV75MWgPo6TL1dsm9rZr8flpL4QNpvQDjLsUqODNsyaPCutAGMdqHH/PEAkpbjzLNCDaOynyCDcn270B+hWpM7zlQSgPig+TG8XllvdX3+mtWTWKPyDjfD7SnpojOpgqA9H2iJUzocJjSp/qbMtHjjGSReY+Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571153225; 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=ZuMPHi1KYaqkC4W5yuor+8zm/GN+VGAvoGOgcDmCAz8=; b=f/6n4zsP5i5YFC9AZEUKVG7vZi4ga5Gw+d3I3SAc+mtKsgTmhSIMH6v4iicn1QjoEsqvVS03pcZCQx0ZcsV4kNnqOnDoeNbnkku/mg5LPTE1aitGLtZ5LnDHjhv6QBQlo2t0Xj/z1X2zFormpfx5n5hvOfY8Bte/yn+qTOBkgmU= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571153225229255.43067454987477; Tue, 15 Oct 2019 08:27:05 -0700 (PDT) Received: from localhost ([::1]:48696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKOiu-0005BZ-JS for importer@patchew.org; Tue, 15 Oct 2019 11:26:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48079) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKOgy-0002ks-6k for qemu-devel@nongnu.org; Tue, 15 Oct 2019 11:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKOgw-0003fi-Rm for qemu-devel@nongnu.org; Tue, 15 Oct 2019 11:24:55 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:47098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iKOgw-0003Z9-4w; Tue, 15 Oct 2019 11:24:54 -0400 Received: from 82-181-115-92.bb.dnainternet.fi ([82.181.115.92] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iKOge-0003aX-1v; Tue, 15 Oct 2019 17:24:36 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iKOfm-00061R-Qa; Tue, 15 Oct 2019 18:23:42 +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=ZuMPHi1KYaqkC4W5yuor+8zm/GN+VGAvoGOgcDmCAz8=; b=pQHnjDI/n7NKdIoYUz0wW2+4YcThL9XK4rM7jhBTegPKIGzTyT49B3DJVuPZEXSw8bLA3l72U3A5QjlxnR5eWShydQYD44M30t4q5KWHSoFN9S0HWiZEoiblHsPE5LGXVI5WpWI25k9+zpb3R73p7ZKRMSWHXDnvf/DBBCxRM0yUGL0enlWVQ0E0t00fgqw44iOyyTROJocDTgEC4NnxjZHAGho3PXPbm6NnUuX719cj7UoWG8NOHYXiUI66zNylkDnfeb61fBUuNsQX6tJOmmDUz61v61JV5Mfo7PUDUz9+Z4W1051uia/CO5iMxiIGKZ7BudJeVCRIEtEh6Im4ow==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH 10/23] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap() Date: Tue, 15 Oct 2019 18:23:21 +0300 Message-Id: <6b1597b199313afeb001790d63ea12b48688154c.1571152571.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 , "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 9a7648af47..d9fe883fe0 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -504,15 +504,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