{"id":813874,"url":"http://patchwork.ozlabs.org/api/patches/813874/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-19-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-19-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:30","name":"[v3,18/20] vpc: Switch to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b96a096cf549a9341b6c9b92d815b3c6c20c11ca","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-19-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/813874/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813874/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xtMGg6y3rz9sPk\n\tfor ;\n\tFri, 15 Sep 2017 01:03:06 +1000 (AEST)","from localhost ([::1]:48301 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVfU-0004dB-Ac\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 11:03:04 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47036)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVKp-0006QL-Fu\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVKo-000355-Gl\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:43 -0400","from mx1.redhat.com ([209.132.183.28]:47368)\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 1dsVKj-00031J-Ue; Thu, 14 Sep 2017 10:41:38 -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 DFE0613A5E;\n\tThu, 14 Sep 2017 14:41:36 +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 35EE660841;\n\tThu, 14 Sep 2017 14:41:33 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DFE0613A5E","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:30 -0500","Message-Id":"<20170914144032.14945-19-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.29]);\n\tThu, 14 Sep 2017 14:41:37 +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 18/20] vpc: Switch to .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 vpc driver accordingly. Drop the now-unused\nget_sector_offset().\n\nSigned-off-by: Eric Blake \n\n---\nv3: rebase to master\nv2: drop get_sector_offset() [Kevin], rebase to mapping flag\n---\n block/vpc.c | 35 ++++++++++++++++++-----------------\n 1 file changed, 18 insertions(+), 17 deletions(-)","diff":"diff --git a/block/vpc.c b/block/vpc.c\nindex 1576d7b595..2daa1db538 100644\n--- a/block/vpc.c\n+++ b/block/vpc.c\n@@ -705,40 +705,42 @@ fail:\n return ret;\n }\n\n-static int64_t coroutine_fn vpc_co_get_block_status(BlockDriverState *bs,\n- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)\n+static int64_t coroutine_fn vpc_co_block_status(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset, int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n BDRVVPCState *s = bs->opaque;\n VHDFooter *footer = (VHDFooter*) s->footer_buf;\n- int64_t start, offset;\n+ int64_t start, image_offset;\n bool allocated;\n int64_t ret;\n int n;\n\n if (be32_to_cpu(footer->type) == VHD_FIXED) {\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 qemu_co_mutex_lock(&s->lock);\n\n- offset = get_image_offset(bs, sector_num << BDRV_SECTOR_BITS, false, NULL);\n- start = offset;\n- allocated = (offset != -1);\n+ image_offset = get_image_offset(bs, offset, false, NULL);\n+ start = image_offset & BDRV_BLOCK_OFFSET_MASK;\n+ allocated = (image_offset != -1);\n *pnum = 0;\n ret = 0;\n\n do {\n /* All sectors in a block are contiguous (without using the bitmap) */\n- n = ROUND_UP(sector_num + 1, s->block_size / BDRV_SECTOR_SIZE)\n- - sector_num;\n- n = MIN(n, nb_sectors);\n+ n = ROUND_UP(offset + 1, s->block_size) - offset;\n+ n = MIN(n, bytes);\n\n *pnum += n;\n- sector_num += n;\n- nb_sectors -= n;\n+ offset += n;\n+ bytes -= n;\n /* *pnum can't be greater than one block for allocated\n * sectors since there is always a bitmap in between. */\n if (allocated) {\n@@ -746,11 +748,10 @@ static int64_t coroutine_fn vpc_co_get_block_status(BlockDriverState *bs,\n ret = BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start;\n break;\n }\n- if (nb_sectors == 0) {\n+ if (bytes == 0) {\n break;\n }\n- offset = get_image_offset(bs, sector_num << BDRV_SECTOR_BITS, false,\n- NULL);\n+ image_offset = get_image_offset(bs, offset, false, NULL);\n } while (offset == -1);\n\n qemu_co_mutex_unlock(&s->lock);\n@@ -1097,7 +1098,7 @@ static BlockDriver bdrv_vpc = {\n\n .bdrv_co_preadv = vpc_co_preadv,\n .bdrv_co_pwritev = vpc_co_pwritev,\n- .bdrv_co_get_block_status = vpc_co_get_block_status,\n+ .bdrv_co_block_status = vpc_co_block_status,\n\n .bdrv_get_info = vpc_get_info,\n\n","prefixes":["v3","18/20"]}