{"id":813854,"url":"http://patchwork.ozlabs.org/api/patches/813854/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-3-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-3-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:14","name":"[v3,02/20] block: Switch passthrough drivers to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1a460c35277775da64050e383889ec790e2c098f","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-3-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/813854/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813854/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xtLzT0hDMz9sRg\n\tfor ;\n\tFri, 15 Sep 2017 00:49:54 +1000 (AEST)","from localhost ([::1]:48216 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVSh-0005oR-Fc\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:49:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46237)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVK3-0005YS-5x\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:40:59 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVJw-0002KK-S5\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:40:55 -0400","from mx1.redhat.com ([209.132.183.28]:47614)\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 1dsVJt-0002Gm-Nw; Thu, 14 Sep 2017 10:40:45 -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 B6628C04B32E;\n\tThu, 14 Sep 2017 14:40:44 +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 149C617AC7;\n\tThu, 14 Sep 2017 14:40:42 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B6628C04B32E","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:14 -0500","Message-Id":"<20170914144032.14945-3-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.31]);\n\tThu, 14 Sep 2017 14:40:44 +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 02/20] block: Switch passthrough drivers 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\tJeff Cody , Max 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. Update the generic helpers, and all passthrough clients\n(blkdebug, commit, mirror, throttle) accordingly.\n\nSigned-off-by: Eric Blake \n\n---\nv3: rebase to addition of throttle driver\nv2: rebase to master, retitle while merging blkdebug, commit, and mirror\n---\n include/block/block_int.h | 26 ++++++++++++++------------\n block/io.c | 30 ++++++++++++++++--------------\n block/blkdebug.c | 19 ++++++++++---------\n block/commit.c | 2 +-\n block/mirror.c | 2 +-\n block/throttle.c | 2 +-\n 6 files changed, 43 insertions(+), 38 deletions(-)","diff":"diff --git a/include/block/block_int.h b/include/block/block_int.h\nindex 0ba57dc35c..ba5c2f9f1f 100644\n--- a/include/block/block_int.h\n+++ b/include/block/block_int.h\n@@ -1004,23 +1004,25 @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,\n uint64_t *nperm, uint64_t *nshared);\n\n /*\n- * Default implementation for drivers to pass bdrv_co_get_block_status() to\n+ * Default implementation for drivers to pass bdrv_co_block_status() to\n * their file.\n */\n-int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,\n- int64_t sector_num,\n- int nb_sectors,\n- int *pnum,\n- BlockDriverState **file);\n+int64_t coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file);\n /*\n- * Default implementation for drivers to pass bdrv_co_get_block_status() to\n+ * Default implementation for drivers to pass bdrv_co_block_status() to\n * their backing file.\n */\n-int64_t coroutine_fn bdrv_co_get_block_status_from_backing(BlockDriverState *bs,\n- int64_t sector_num,\n- int nb_sectors,\n- int *pnum,\n- BlockDriverState **file);\n+int64_t coroutine_fn bdrv_co_block_status_from_backing(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file);\n const char *bdrv_get_parent_name(const BlockDriverState *bs);\n void blk_dev_change_media_cb(BlockBackend *blk, bool load, Error **errp);\n bool blk_dev_has_removable_media(BlockBackend *blk);\ndiff --git a/block/io.c b/block/io.c\nindex 4fb544d25c..85c01b2800 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1708,30 +1708,32 @@ typedef struct BdrvCoBlockStatusData {\n bool done;\n } BdrvCoBlockStatusData;\n\n-int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,\n- int64_t sector_num,\n- int nb_sectors,\n- int *pnum,\n- BlockDriverState **file)\n+int64_t coroutine_fn bdrv_co_block_status_from_file(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n assert(bs->file && bs->file->bs);\n- *pnum = nb_sectors;\n+ *pnum = bytes;\n *file = bs->file->bs;\n return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |\n- (sector_num << BDRV_SECTOR_BITS);\n+ (offset & BDRV_BLOCK_OFFSET_MASK);\n }\n\n-int64_t coroutine_fn bdrv_co_get_block_status_from_backing(BlockDriverState *bs,\n- int64_t sector_num,\n- int nb_sectors,\n- int *pnum,\n- BlockDriverState **file)\n+int64_t coroutine_fn bdrv_co_block_status_from_backing(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n assert(bs->backing && bs->backing->bs);\n- *pnum = nb_sectors;\n+ *pnum = bytes;\n *file = bs->backing->bs;\n return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |\n- (sector_num << BDRV_SECTOR_BITS);\n+ (offset & BDRV_BLOCK_OFFSET_MASK);\n }\n\n /*\ndiff --git a/block/blkdebug.c b/block/blkdebug.c\nindex f54fe33cae..2458912175 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -628,15 +628,16 @@ static int coroutine_fn blkdebug_co_pdiscard(BlockDriverState *bs,\n return bdrv_co_pdiscard(bs->file->bs, offset, bytes);\n }\n\n-static int64_t coroutine_fn blkdebug_co_get_block_status(\n- BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,\n- BlockDriverState **file)\n+static int64_t coroutine_fn blkdebug_co_block_status(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n- assert(QEMU_IS_ALIGNED(sector_num | nb_sectors,\n- DIV_ROUND_UP(bs->bl.request_alignment,\n- BDRV_SECTOR_SIZE)));\n- return bdrv_co_get_block_status_from_file(bs, sector_num, nb_sectors,\n- pnum, file);\n+ assert(QEMU_IS_ALIGNED(offset | bytes, bs->bl.request_alignment));\n+ return bdrv_co_block_status_from_file(bs, mapping, offset, bytes,\n+ pnum, file);\n }\n\n static void blkdebug_close(BlockDriverState *bs)\n@@ -908,7 +909,7 @@ static BlockDriver bdrv_blkdebug = {\n .bdrv_co_flush_to_disk = blkdebug_co_flush,\n .bdrv_co_pwrite_zeroes = blkdebug_co_pwrite_zeroes,\n .bdrv_co_pdiscard = blkdebug_co_pdiscard,\n- .bdrv_co_get_block_status = blkdebug_co_get_block_status,\n+ .bdrv_co_block_status = blkdebug_co_block_status,\n\n .bdrv_debug_event = blkdebug_debug_event,\n .bdrv_debug_breakpoint = blkdebug_debug_breakpoint,\ndiff --git a/block/commit.c b/block/commit.c\nindex 898d91f653..5516df1a6e 100644\n--- a/block/commit.c\n+++ b/block/commit.c\n@@ -269,7 +269,7 @@ static void bdrv_commit_top_child_perm(BlockDriverState *bs, BdrvChild *c,\n static BlockDriver bdrv_commit_top = {\n .format_name = \"commit_top\",\n .bdrv_co_preadv = bdrv_commit_top_preadv,\n- .bdrv_co_get_block_status = bdrv_co_get_block_status_from_backing,\n+ .bdrv_co_block_status = bdrv_co_block_status_from_backing,\n .bdrv_refresh_filename = bdrv_commit_top_refresh_filename,\n .bdrv_close = bdrv_commit_top_close,\n .bdrv_child_perm = bdrv_commit_top_child_perm,\ndiff --git a/block/mirror.c b/block/mirror.c\nindex fab59739c5..bada3be20a 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -1084,7 +1084,7 @@ static BlockDriver bdrv_mirror_top = {\n .bdrv_co_pwrite_zeroes = bdrv_mirror_top_pwrite_zeroes,\n .bdrv_co_pdiscard = bdrv_mirror_top_pdiscard,\n .bdrv_co_flush = bdrv_mirror_top_flush,\n- .bdrv_co_get_block_status = bdrv_co_get_block_status_from_backing,\n+ .bdrv_co_block_status = bdrv_co_block_status_from_backing,\n .bdrv_refresh_filename = bdrv_mirror_top_refresh_filename,\n .bdrv_close = bdrv_mirror_top_close,\n .bdrv_child_perm = bdrv_mirror_top_child_perm,\ndiff --git a/block/throttle.c b/block/throttle.c\nindex 5bca76300f..76cd963a8c 100644\n--- a/block/throttle.c\n+++ b/block/throttle.c\n@@ -224,7 +224,7 @@ static BlockDriver bdrv_throttle = {\n .bdrv_reopen_prepare = throttle_reopen_prepare,\n .bdrv_reopen_commit = throttle_reopen_commit,\n .bdrv_reopen_abort = throttle_reopen_abort,\n- .bdrv_co_get_block_status = bdrv_co_get_block_status_from_file,\n+ .bdrv_co_block_status = bdrv_co_block_status_from_file,\n\n .is_filter = true,\n };\n","prefixes":["v3","02/20"]}