{"id":813851,"url":"http://patchwork.ozlabs.org/api/patches/813851/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-15-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-15-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:26","name":"[v3,14/20] sheepdog: Switch to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"136d2ebb2df7536727541fc7c81342a9206af333","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-15-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/813851/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813851/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 3xtLwv3Rm5z9s0Z\n\tfor ;\n\tFri, 15 Sep 2017 00:47:43 +1000 (AEST)","from localhost ([::1]:48208 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVQb-0003Ix-GT\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:47:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46908)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVKi-0006DF-4I\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVKd-0002v9-Vb\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:36 -0400","from mx1.redhat.com ([209.132.183.28]:49000)\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 1dsVKX-0002nB-Mf; Thu, 14 Sep 2017 10:41:25 -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 ABA63285B9;\n\tThu, 14 Sep 2017 14:41:24 +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 A7EA960841;\n\tThu, 14 Sep 2017 14:41:21 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com ABA63285B9","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:26 -0500","Message-Id":"<20170914144032.14945-15-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:24 +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 14/20] sheepdog: 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, qemu-block@nongnu.org,\n\tHitoshi Mitake ,\n\tJeff Cody , Max Reitz ,\n\t\"open list:Sheepdog\" ,\n\tLiu Yuan , jsnow@redhat.com","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 sheepdog driver accordingly.\n\nSigned-off-by: Eric Blake \n\n---\nv2: rebase to mapping flag\n---\n block/sheepdog.c | 23 +++++++++++------------\n 1 file changed, 11 insertions(+), 12 deletions(-)","diff":"diff --git a/block/sheepdog.c b/block/sheepdog.c\nindex 696a71442a..09c431decc 100644\n--- a/block/sheepdog.c\n+++ b/block/sheepdog.c\n@@ -2989,18 +2989,17 @@ static coroutine_fn int sd_co_pdiscard(BlockDriverState *bs, int64_t offset,\n }\n\n static coroutine_fn int64_t\n-sd_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors,\n- int *pnum, BlockDriverState **file)\n+sd_co_block_status(BlockDriverState *bs, bool mapping, int64_t offset,\n+ int64_t bytes, int64_t *pnum, BlockDriverState **file)\n {\n BDRVSheepdogState *s = bs->opaque;\n SheepdogInode *inode = &s->inode;\n uint32_t object_size = (UINT32_C(1) << inode->block_size_shift);\n- uint64_t offset = sector_num * BDRV_SECTOR_SIZE;\n unsigned long start = offset / object_size,\n- end = DIV_ROUND_UP((sector_num + nb_sectors) *\n- BDRV_SECTOR_SIZE, object_size);\n+ end = DIV_ROUND_UP(offset + bytes, object_size);\n unsigned long idx;\n- int64_t ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset;\n+ int64_t ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |\n+ (offset & BDRV_BLOCK_OFFSET_MASK);\n\n for (idx = start; idx < end; idx++) {\n if (inode->data_vdi_id[idx] == 0) {\n@@ -3017,9 +3016,9 @@ sd_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors,\n }\n }\n\n- *pnum = (idx - start) * object_size / BDRV_SECTOR_SIZE;\n- if (*pnum > nb_sectors) {\n- *pnum = nb_sectors;\n+ *pnum = (idx - start) * object_size;\n+ if (*pnum > bytes) {\n+ *pnum = bytes;\n }\n if (ret > 0 && ret & BDRV_BLOCK_OFFSET_VALID) {\n *file = bs;\n@@ -3097,7 +3096,7 @@ static BlockDriver bdrv_sheepdog = {\n .bdrv_co_writev = sd_co_writev,\n .bdrv_co_flush_to_disk = sd_co_flush_to_disk,\n .bdrv_co_pdiscard = sd_co_pdiscard,\n- .bdrv_co_get_block_status = sd_co_get_block_status,\n+ .bdrv_co_block_status = sd_co_block_status,\n\n .bdrv_snapshot_create = sd_snapshot_create,\n .bdrv_snapshot_goto = sd_snapshot_goto,\n@@ -3133,7 +3132,7 @@ static BlockDriver bdrv_sheepdog_tcp = {\n .bdrv_co_writev = sd_co_writev,\n .bdrv_co_flush_to_disk = sd_co_flush_to_disk,\n .bdrv_co_pdiscard = sd_co_pdiscard,\n- .bdrv_co_get_block_status = sd_co_get_block_status,\n+ .bdrv_co_block_status = sd_co_block_status,\n\n .bdrv_snapshot_create = sd_snapshot_create,\n .bdrv_snapshot_goto = sd_snapshot_goto,\n@@ -3169,7 +3168,7 @@ static BlockDriver bdrv_sheepdog_unix = {\n .bdrv_co_writev = sd_co_writev,\n .bdrv_co_flush_to_disk = sd_co_flush_to_disk,\n .bdrv_co_pdiscard = sd_co_pdiscard,\n- .bdrv_co_get_block_status = sd_co_get_block_status,\n+ .bdrv_co_block_status = sd_co_block_status,\n\n .bdrv_snapshot_create = sd_snapshot_create,\n .bdrv_snapshot_goto = sd_snapshot_goto,\n","prefixes":["v3","14/20"]}