{"id":1307002,"url":"http://patchwork.ozlabs.org/api/patches/1307002/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/5373a508b5a8b9a961d1aa79833de988dc370666.1591801197.git.berto@igalia.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<5373a508b5a8b9a961d1aa79833de988dc370666.1591801197.git.berto@igalia.com>","list_archive_url":null,"date":"2020-06-10T15:02:51","name":"[v8,13/34] qcow2: Update get/set_l2_entry() and add get/set_l2_bitmap()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6844182b37f1d09b79469043059904edad7f1931","submitter":{"id":65704,"url":"http://patchwork.ozlabs.org/api/people/65704/?format=json","name":"Alberto Garcia","email":"berto@igalia.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/5373a508b5a8b9a961d1aa79833de988dc370666.1591801197.git.berto@igalia.com/mbox/","series":[{"id":182563,"url":"http://patchwork.ozlabs.org/api/series/182563/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=182563","date":"2020-06-10T15:02:49","name":"Add subcluster allocation to qcow2","version":8,"mbox":"http://patchwork.ozlabs.org/series/182563/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1307002/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1307002/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=<UNKNOWN>)","ozlabs.org;\n dmarc=none (p=none dis=none) header.from=igalia.com","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256\n header.s=20170329 header.b=hf0hgFPg;\n\tdkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49hr054wqyz9sQx\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 11 Jun 2020 01:05:40 +1000 (AEST)","from localhost ([::1]:48388 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1jj2IJ-0002Hd-I6\n\tfor incoming@patchwork.ozlabs.org; Wed, 10 Jun 2020 11:05:35 -0400","from eggs.gnu.org ([2001:470:142:3::10]:35948)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <berto@igalia.com>)\n id 1jj2GZ-0002Gs-3X; Wed, 10 Jun 2020 11:03:47 -0400","from fanzine.igalia.com ([178.60.130.6]:58076)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <berto@igalia.com>)\n id 1jj2GW-0006w1-SO; Wed, 10 Jun 2020 11:03:46 -0400","from [81.0.38.199] (helo=perseus.local)\n by fanzine.igalia.com with esmtpsa\n (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim)\n id 1jj2GR-0007gt-CR; Wed, 10 Jun 2020 17:03:39 +0200","from berto by perseus.local with local (Exim 4.92)\n (envelope-from <berto@igalia.com>)\n id 1jj2GC-0007My-1f; Wed, 10 Jun 2020 17:03:24 +0200"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com;\n s=20170329;\n h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From;\n bh=3TcxrFGVkCtUtsIcvfPDHVNJ3SGTTueaU2gMyJDgFo0=;\n b=hf0hgFPg4+cvB5RAm2eQIiOk7f/jreIuLu/HovOBI86dpmPewieRVJ+BNQzp1SSjqJFOMjci+xLXjfenCWhPJkeZ6ESFvKgCYyfTdz4Fbuy9rrASdAOXlsrFBZwkcUFP1adNvTuyio7S/soknyMZ7mN1FN2RbGFBlYvbeUm/UtamPeZRZ2GIW+KXLISjjXnXZEZqUZ/m+GxFIQzM77qrZy4XEF3wGKEjvTAP2xq8yEPGkxGsIolHH6YogQINeLjwmQ4VoGQosq4Wz37EkGAEQjedP6x+wGDqN/m2MDzg/FDE4e2Bq0h2ZK/GkiIhusiMKEXu8wIQ7+YJ2QZwUppA4Q==;","From":"Alberto Garcia <berto@igalia.com>","To":"qemu-devel@nongnu.org","Subject":"[PATCH v8 13/34] qcow2: Update get/set_l2_entry() and add\n get/set_l2_bitmap()","Date":"Wed, 10 Jun 2020 17:02:51 +0200","Message-Id":"\n <5373a508b5a8b9a961d1aa79833de988dc370666.1591801197.git.berto@igalia.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<cover.1591801197.git.berto@igalia.com>","References":"<cover.1591801197.git.berto@igalia.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=178.60.130.6; envelope-from=berto@igalia.com;\n helo=fanzine.igalia.com","X-detected-operating-system":"by eggs.gnu.org: First seen = 2020/06/10 11:03:39","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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=_AUTOLEARN","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Kevin Wolf <kwolf@redhat.com>,\n Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,\n Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org,\n Derek Su <dereksu@qnap.com>, Max Reitz <mreitz@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Extended L2 entries are 128-bit wide: 64 bits for the entry itself and\n64 bits for the subcluster allocation bitmap.\n\nIn order to support them correctly get/set_l2_entry() need to be\nupdated so they take the entry width into account in order to\ncalculate the correct offset.\n\nThis patch also adds the get/set_l2_bitmap() functions that are\nused to access the bitmaps. For convenience we allow calling\nget_l2_bitmap() on images without subclusters. In this case the\nreturned value is always 0 and has no meaning.\n\nSigned-off-by: Alberto Garcia <berto@igalia.com>\nReviewed-by: Eric Blake <eblake@redhat.com>\n---\n block/qcow2.h | 21 +++++++++++++++++++++\n 1 file changed, 21 insertions(+)","diff":"diff --git a/block/qcow2.h b/block/qcow2.h\nindex 46b351229a..82b86f6cec 100644\n--- a/block/qcow2.h\n+++ b/block/qcow2.h\n@@ -533,15 +533,36 @@ static inline size_t l2_entry_size(BDRVQcow2State *s)\n static inline uint64_t get_l2_entry(BDRVQcow2State *s, uint64_t *l2_slice,\n                                     int idx)\n {\n+    idx *= l2_entry_size(s) / sizeof(uint64_t);\n     return be64_to_cpu(l2_slice[idx]);\n }\n \n+static inline uint64_t get_l2_bitmap(BDRVQcow2State *s, uint64_t *l2_slice,\n+                                     int idx)\n+{\n+    if (has_subclusters(s)) {\n+        idx *= l2_entry_size(s) / sizeof(uint64_t);\n+        return be64_to_cpu(l2_slice[idx + 1]);\n+    } else {\n+        return 0; /* For convenience only; this value has no meaning. */\n+    }\n+}\n+\n static inline void set_l2_entry(BDRVQcow2State *s, uint64_t *l2_slice,\n                                 int idx, uint64_t entry)\n {\n+    idx *= l2_entry_size(s) / sizeof(uint64_t);\n     l2_slice[idx] = cpu_to_be64(entry);\n }\n \n+static inline void set_l2_bitmap(BDRVQcow2State *s, uint64_t *l2_slice,\n+                                 int idx, uint64_t bitmap)\n+{\n+    assert(has_subclusters(s));\n+    idx *= l2_entry_size(s) / sizeof(uint64_t);\n+    l2_slice[idx + 1] = cpu_to_be64(bitmap);\n+}\n+\n static inline bool has_data_file(BlockDriverState *bs)\n {\n     BDRVQcow2State *s = bs->opaque;\n","prefixes":["v8","13/34"]}