{"id":813511,"url":"http://patchwork.ozlabs.org/api/patches/813511/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-10-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":"<20170913160333.23622-10-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-13T16:03:19","name":"[v4,09/23] block: Switch BdrvCoGetBlockStatusData to byte-based","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b9b8faa32a624b9ce6a1515136271160b14aec0","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/20170913160333.23622-10-eblake@redhat.com/mbox/","series":[{"id":2944,"url":"http://patchwork.ozlabs.org/api/series/2944/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2944","date":"2017-09-13T16:03:10","name":"make bdrv_get_block_status byte-based","version":4,"mbox":"http://patchwork.ozlabs.org/series/2944/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813511/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813511/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=208.118.235.17; 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 [208.118.235.17])\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 3xsmqr0qMMz9sNV\n\tfor ;\n\tThu, 14 Sep 2017 02:11:20 +1000 (AEST)","from localhost ([::1]:43383 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsAFy-0000mf-3J\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 12:11:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45829)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsA9P-0001ef-Sb\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsA9O-0006Cy-Vi\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:31 -0400","from mx1.redhat.com ([209.132.183.28]:52168)\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 1dsA9H-00067f-LQ; Wed, 13 Sep 2017 12:04:23 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 B41D35F73C;\n\tWed, 13 Sep 2017 16:04:22 +0000 (UTC)","from red.redhat.com (ovpn-120-201.rdu2.redhat.com [10.10.120.201])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7367469FA2;\n\tWed, 13 Sep 2017 16:04:18 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B41D35F73C","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 11:03:19 -0500","Message-Id":"<20170913160333.23622-10-eblake@redhat.com>","In-Reply-To":"<20170913160333.23622-1-eblake@redhat.com>","References":"<20170913160333.23622-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 13 Sep 2017 16:04:22 +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 v4 09/23] block: Switch\n\tBdrvCoGetBlockStatusData to byte-based","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 converting to byte-based interfaces, as they are\neasier to reason about than sector-based. Convert another internal\ntype (no semantic change), and rename it to match the corresponding\npublic function rename.\n\nSigned-off-by: Eric Blake \nReviewed-by: Fam Zheng \n\n---\nv4: no change\nv3: rebase to context conflicts, simple enough to keep R-b\nv2: rebase to earlier changes\n---\n block/io.c | 31 ++++++++++++++++++-------------\n 1 file changed, 18 insertions(+), 13 deletions(-)","diff":"diff --git a/block/io.c b/block/io.c\nindex da85c903dd..0adfbb8e70 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1700,17 +1700,17 @@ int bdrv_flush_all(void)\n }\n\n\n-typedef struct BdrvCoGetBlockStatusData {\n+typedef struct BdrvCoBlockStatusData {\n BlockDriverState *bs;\n BlockDriverState *base;\n BlockDriverState **file;\n- int64_t sector_num;\n- int nb_sectors;\n- int *pnum;\n+ int64_t offset;\n+ int64_t bytes;\n+ int64_t *pnum;\n int64_t ret;\n bool mapping;\n bool done;\n-} BdrvCoGetBlockStatusData;\n+} BdrvCoBlockStatusData;\n\n int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *bs,\n int64_t sector_num,\n@@ -1941,14 +1941,16 @@ static int64_t coroutine_fn bdrv_co_get_block_status_above(BlockDriverState *bs,\n /* Coroutine wrapper for bdrv_get_block_status_above() */\n static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque)\n {\n- BdrvCoGetBlockStatusData *data = opaque;\n+ BdrvCoBlockStatusData *data = opaque;\n+ int n;\n\n data->ret = bdrv_co_get_block_status_above(data->bs, data->base,\n data->mapping,\n- data->sector_num,\n- data->nb_sectors,\n- data->pnum,\n+ data->offset >> BDRV_SECTOR_BITS,\n+ data->bytes >> BDRV_SECTOR_BITS,\n+ &n,\n data->file);\n+ *data->pnum = n * BDRV_SECTOR_SIZE;\n data->done = true;\n }\n\n@@ -1965,13 +1967,14 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs,\n BlockDriverState **file)\n {\n Coroutine *co;\n- BdrvCoGetBlockStatusData data = {\n+ int64_t n;\n+ BdrvCoBlockStatusData data = {\n .bs = bs,\n .base = base,\n .file = file,\n- .sector_num = sector_num,\n- .nb_sectors = nb_sectors,\n- .pnum = pnum,\n+ .offset = sector_num * BDRV_SECTOR_SIZE,\n+ .bytes = nb_sectors * BDRV_SECTOR_SIZE,\n+ .pnum = &n,\n .mapping = mapping,\n .done = false,\n };\n@@ -1985,6 +1988,8 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs,\n bdrv_coroutine_enter(bs, co);\n BDRV_POLL_WHILE(bs, !data.done);\n }\n+ assert(data.ret < 0 || QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE));\n+ *pnum = n >> BDRV_SECTOR_BITS;\n return data.ret;\n }\n\n","prefixes":["v4","09/23"]}