{"id":813871,"url":"http://patchwork.ozlabs.org/api/patches/813871/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-12-eblake@redhat.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":"<20170914144032.14945-12-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:23","name":"[v3,11/20] qcow2: Switch to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"44159eb7b6417790e8cfb16bf517db325bd4ac8b","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-12-eblake@redhat.com/mbox/","series":[{"id":3114,"url":"http://patchwork.ozlabs.org/api/series/3114/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3114","date":"2017-09-14T14:40:12","name":"add byte-based block_status driver callbacks","version":3,"mbox":"http://patchwork.ozlabs.org/series/3114/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813871/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813871/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\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xtMDJ6xPqz9sP1\n\tfor ;\n\tFri, 15 Sep 2017 01:01:03 +1000 (AEST)","from localhost ([::1]:48288 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVdU-0002j1-Rr\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 11:01:00 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46753)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVKb-00065G-7q\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVKW-0002mg-KF\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:29 -0400","from mx1.redhat.com ([209.132.183.28]:48600)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsVKQ-0002gv-MD; Thu, 14 Sep 2017 10:41:18 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id BE038285C1;\n\tThu, 14 Sep 2017 14:41:17 +0000 (UTC)","from red.redhat.com (ovpn-123-70.rdu2.redhat.com [10.10.123.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A3D1060841;\n\tThu, 14 Sep 2017 14:41:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com BE038285C1","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:23 -0500","Message-Id":"<20170914144032.14945-12-eblake@redhat.com>","In-Reply-To":"<20170914144032.14945-1-eblake@redhat.com>","References":"<20170914144032.14945-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 14 Sep 2017 14:41:17 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 11/20] qcow2: Switch to\n\t.bdrv_co_block_status()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, famz@redhat.com, jsnow@redhat.com,\n\tqemu-block@nongnu.org, Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We are gradually moving away from sector-based interfaces, towards\nbyte-based. Update the qcow2 driver accordingly.\n\nFor now, we are ignoring the 'mapping' hint. However, it should\nbe relatively straightforward to honor the hint as a way to return\nlarger *pnum values when we have consecutive clusters with the same\ndata/zero status but which differ only in having non-consecutive\nmappings.\n\nSigned-off-by: Eric Blake \n\n---\nv2: rebase to mapping flag\n---\n block/qcow2.c | 21 ++++++++++++---------\n 1 file changed, 12 insertions(+), 9 deletions(-)","diff":"diff --git a/block/qcow2.c b/block/qcow2.c\nindex 721cb077fe..de5f737681 100644\n--- a/block/qcow2.c\n+++ b/block/qcow2.c\n@@ -1624,8 +1624,12 @@ static void qcow2_join_options(QDict *options, QDict *old_options)\n }\n }\n\n-static int64_t coroutine_fn qcow2_co_get_block_status(BlockDriverState *bs,\n- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)\n+static int64_t coroutine_fn qcow2_co_block_status(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t count,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n BDRVQcow2State *s = bs->opaque;\n uint64_t cluster_offset;\n@@ -1633,21 +1637,20 @@ static int64_t coroutine_fn qcow2_co_get_block_status(BlockDriverState *bs,\n unsigned int bytes;\n int64_t status = 0;\n\n- bytes = MIN(INT_MAX, nb_sectors * BDRV_SECTOR_SIZE);\n+ bytes = MIN(INT_MAX, count);\n qemu_co_mutex_lock(&s->lock);\n- ret = qcow2_get_cluster_offset(bs, sector_num << 9, &bytes,\n- &cluster_offset);\n+ ret = qcow2_get_cluster_offset(bs, offset, &bytes, &cluster_offset);\n qemu_co_mutex_unlock(&s->lock);\n if (ret < 0) {\n return ret;\n }\n\n- *pnum = bytes >> BDRV_SECTOR_BITS;\n+ *pnum = bytes;\n\n if (cluster_offset != 0 && ret != QCOW2_CLUSTER_COMPRESSED &&\n !s->crypto) {\n- index_in_cluster = sector_num & (s->cluster_sectors - 1);\n- cluster_offset |= (index_in_cluster << BDRV_SECTOR_BITS);\n+ index_in_cluster = offset & (s->cluster_size - 1);\n+ cluster_offset |= (index_in_cluster & BDRV_BLOCK_OFFSET_MASK);\n *file = bs->file->bs;\n status |= BDRV_BLOCK_OFFSET_VALID | cluster_offset;\n }\n@@ -4259,7 +4262,7 @@ BlockDriver bdrv_qcow2 = {\n .bdrv_child_perm = bdrv_format_default_perms,\n .bdrv_create = qcow2_create,\n .bdrv_has_zero_init = bdrv_has_zero_init_1,\n- .bdrv_co_get_block_status = qcow2_co_get_block_status,\n+ .bdrv_co_block_status = qcow2_co_block_status,\n\n .bdrv_co_preadv = qcow2_co_preadv,\n .bdrv_co_pwritev = qcow2_co_pwritev,\n","prefixes":["v3","11/20"]}