{"id":813864,"url":"http://patchwork.ozlabs.org/api/patches/813864/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-21-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-21-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:32","name":"[v3,20/20] block: Drop unused .bdrv_co_get_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"159131e31ab31400c7a12092d0e1ecad4944620e","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-21-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/813864/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813864/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xtM5s44ZKz9sRW\n\tfor ;\n\tFri, 15 Sep 2017 00:55:29 +1000 (AEST)","from localhost ([::1]:48241 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVY7-0004c8-K6\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:55:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47107)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVKs-0006Vx-Nc\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVKr-00038N-Of\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:46 -0400","from mx1.redhat.com ([209.132.183.28]:55462)\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 1dsVKp-000352-2R; Thu, 14 Sep 2017 10:41:43 -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 134AA61462;\n\tThu, 14 Sep 2017 14:41:42 +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 A486C60841;\n\tThu, 14 Sep 2017 14:41:38 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 134AA61462","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:32 -0500","Message-Id":"<20170914144032.14945-21-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.39]);\n\tThu, 14 Sep 2017 14:41:42 +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 20/20] block: Drop unused\n\t.bdrv_co_get_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\tMax Reitz ,\n\tStefan Hajnoczi , 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. Now that all drivers have been updated to provide the\nbyte-based .bdrv_co_block_status(), we can delete the sector-based\ninterface.\n\nSigned-off-by: Eric Blake \n\n---\nv2: rebase to earlier changes\n---\n include/block/block_int.h | 3 ---\n block/io.c | 23 +----------------------\n 2 files changed, 1 insertion(+), 25 deletions(-)","diff":"diff --git a/include/block/block_int.h b/include/block/block_int.h\nindex ba5c2f9f1f..0bb5e9ebe0 100644\n--- a/include/block/block_int.h\n+++ b/include/block/block_int.h\n@@ -212,9 +212,6 @@ struct BlockDriver {\n * (favor larger *pnum). The block layer guarantees input aligned\n * to request_alignment, as well as non-NULL pnum and file.\n */\n- int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs,\n- int64_t sector_num, int nb_sectors, int *pnum,\n- BlockDriverState **file);\n int64_t coroutine_fn (*bdrv_co_block_status)(BlockDriverState *bd,\n bool mapping, int64_t offset, int64_t bytes, int64_t *pnum,\n BlockDriverState **file);\ndiff --git a/block/io.c b/block/io.c\nindex 85c01b2800..e58da6f81a 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1796,7 +1796,7 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs,\n bytes = n;\n }\n\n- if (!bs->drv->bdrv_co_get_block_status && !bs->drv->bdrv_co_block_status) {\n+ if (!bs->drv->bdrv_co_block_status) {\n *pnum = bytes;\n ret = BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED;\n if (offset + bytes == total_size) {\n@@ -1817,29 +1817,9 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs,\n\n /* Round out to request_alignment boundaries */\n align = bs->bl.request_alignment;\n- if (bs->drv->bdrv_co_get_block_status && align < BDRV_SECTOR_SIZE) {\n- align = BDRV_SECTOR_SIZE;\n- }\n aligned_offset = QEMU_ALIGN_DOWN(offset, align);\n aligned_bytes = ROUND_UP(offset + bytes, align) - aligned_offset;\n\n- if (bs->drv->bdrv_co_get_block_status) {\n- int count; /* sectors */\n-\n- assert(QEMU_IS_ALIGNED(aligned_offset | aligned_bytes,\n- BDRV_SECTOR_SIZE));\n- ret = bs->drv->bdrv_co_get_block_status(\n- bs, aligned_offset >> BDRV_SECTOR_BITS,\n- MIN(INT_MAX, aligned_bytes) >> BDRV_SECTOR_BITS, &count,\n- &local_file);\n- if (ret < 0) {\n- *pnum = 0;\n- goto out;\n- }\n- *pnum = count * BDRV_SECTOR_SIZE;\n- goto refine;\n- }\n-\n ret = bs->drv->bdrv_co_block_status(bs, mapping, aligned_offset,\n aligned_bytes, pnum, &local_file);\n if (ret < 0) {\n@@ -1856,7 +1836,6 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs,\n *pnum = total_size - aligned_offset;\n }\n\n- refine:\n /* Clamp pnum and ret to original request */\n assert(QEMU_IS_ALIGNED(*pnum, align));\n *pnum -= offset - aligned_offset;\n","prefixes":["v3","20/20"]}