{"id":1307026,"url":"http://patchwork.ozlabs.org/api/patches/1307026/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/2ba36cf3cce78b6f5bd1e763be9cd18d8a08ef87.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":"<2ba36cf3cce78b6f5bd1e763be9cd18d8a08ef87.1591801197.git.berto@igalia.com>","list_archive_url":null,"date":"2020-06-10T15:02:57","name":"[v8,19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3fdd212807a52f2a5284e0e4ed3befc5830c044a","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/2ba36cf3cce78b6f5bd1e763be9cd18d8a08ef87.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/1307026/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1307026/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=Hk97vAeG;\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 49hrM21Mkwz9sQx\n\tfor ; Thu, 11 Jun 2020 01:22:06 +1000 (AEST)","from localhost ([::1]:48002 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1jj2YE-0002zY-Nb\n\tfor incoming@patchwork.ozlabs.org; Wed, 10 Jun 2020 11:22:02 -0400","from eggs.gnu.org ([2001:470:142:3::10]:36160)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1jj2Gy-0002la-Dv; Wed, 10 Jun 2020 11:04:12 -0400","from fanzine.igalia.com ([178.60.130.6]:58248)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1jj2Gs-0006wX-O4; Wed, 10 Jun 2020 11:04:11 -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-0007gz-OV; Wed, 10 Jun 2020 17:03:39 +0200","from berto by perseus.local with local (Exim 4.92)\n (envelope-from )\n id 1jj2GC-0007NH-7S; 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=JEa0mBV8UvnDyp5H8sfvCfcFuf5ZD0l+4WnlR2HdDiw=;\n b=Hk97vAeGneHEIfUo6TQa1lI6UJ7nJwyzpFLcA3BZWh1mzGFS36g3ARbEWBN48fi+FdbNgOPxPT382eFvnP/x6D9Q1pVwF8eodV/Z279j5itqhaHmjkOQ4wR/5/CFhsa4i8oDmw03i5vjhsUBVb6HcxXOLzDspDtMhmXnFWZY9T76ziaZpPnENjPYsk25gGTTOXJZutctfplzvDBXEv8QpFDoaJMQDzcL7uUmVY/JLoY1zlCLdEWpgI1jolAXPnKf2k4/h3k6YmK3Jo4WkFK9NtUe1lTPGXxNd14XVPeh+GAi0nms+273df/5RgOPc9cME4nk72IY0cFwtzT6frI5mA==;","From":"Alberto Garcia ","To":"qemu-devel@nongnu.org","Subject":"[PATCH v8 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC","Date":"Wed, 10 Jun 2020 17:02:57 +0200","Message-Id":"\n <2ba36cf3cce78b6f5bd1e763be9cd18d8a08ef87.1591801197.git.berto@igalia.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"","References":"","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":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"Kevin Wolf ,\n Vladimir Sementsov-Ogievskiy ,\n Alberto Garcia , qemu-block@nongnu.org,\n Derek Su , Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"When dealing with subcluster types there is a new value called\nQCOW2_SUBCLUSTER_UNALLOCATED_ALLOC that has no equivalent in\nQCow2ClusterType.\n\nThis patch handles that value in all places where subcluster types\nare processed.\n\nSigned-off-by: Alberto Garcia \nReviewed-by: Max Reitz \nReviewed-by: Vladimir Sementsov-Ogievskiy \n---\n block/qcow2.c | 12 +++++++++---\n 1 file changed, 9 insertions(+), 3 deletions(-)","diff":"diff --git a/block/qcow2.c b/block/qcow2.c\nindex 2f7a2a7c7a..a3481cd85b 100644\n--- a/block/qcow2.c\n+++ b/block/qcow2.c\n@@ -2054,7 +2054,8 @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,\n *pnum = bytes;\n \n if ((type == QCOW2_SUBCLUSTER_NORMAL ||\n- type == QCOW2_SUBCLUSTER_ZERO_ALLOC) && !s->crypto) {\n+ type == QCOW2_SUBCLUSTER_ZERO_ALLOC ||\n+ type == QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) && !s->crypto) {\n *map = host_offset;\n *file = s->data_file->bs;\n status |= BDRV_BLOCK_OFFSET_VALID;\n@@ -2062,7 +2063,8 @@ static int coroutine_fn qcow2_co_block_status(BlockDriverState *bs,\n if (type == QCOW2_SUBCLUSTER_ZERO_PLAIN ||\n type == QCOW2_SUBCLUSTER_ZERO_ALLOC) {\n status |= BDRV_BLOCK_ZERO;\n- } else if (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN) {\n+ } else if (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN &&\n+ type != QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC) {\n status |= BDRV_BLOCK_DATA;\n }\n if (s->metadata_preallocation && (status & BDRV_BLOCK_DATA) &&\n@@ -2225,6 +2227,7 @@ static coroutine_fn int qcow2_co_preadv_task(BlockDriverState *bs,\n g_assert_not_reached();\n \n case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:\n+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:\n assert(bs->backing); /* otherwise handled in qcow2_co_preadv_part */\n \n BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);\n@@ -2293,7 +2296,8 @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,\n \n if (type == QCOW2_SUBCLUSTER_ZERO_PLAIN ||\n type == QCOW2_SUBCLUSTER_ZERO_ALLOC ||\n- (type == QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backing))\n+ (type == QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN && !bs->backing) ||\n+ (type == QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC && !bs->backing))\n {\n qemu_iovec_memset(qiov, qiov_offset, 0, cur_bytes);\n } else {\n@@ -3865,6 +3869,7 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs,\n ret = qcow2_get_host_offset(bs, offset, &nr, &off, &type);\n if (ret < 0 ||\n (type != QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN &&\n+ type != QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC &&\n type != QCOW2_SUBCLUSTER_ZERO_PLAIN &&\n type != QCOW2_SUBCLUSTER_ZERO_ALLOC)) {\n qemu_co_mutex_unlock(&s->lock);\n@@ -3943,6 +3948,7 @@ qcow2_co_copy_range_from(BlockDriverState *bs,\n \n switch (type) {\n case QCOW2_SUBCLUSTER_UNALLOCATED_PLAIN:\n+ case QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC:\n if (bs->backing && bs->backing->bs) {\n int64_t backing_length = bdrv_getlength(bs->backing->bs);\n if (src_offset >= backing_length) {\n","prefixes":["v8","19/34"]}