{"id":813860,"url":"http://patchwork.ozlabs.org/api/patches/813860/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-17-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-17-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:28","name":"[v3,16/20] vdi: Switch to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f41e00d4e507707cc26c9b47e30eeaaa8d73098d","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-17-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/813860/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813860/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xtM3L1YDnz9sRW\n\tfor ;\n\tFri, 15 Sep 2017 00:53:18 +1000 (AEST)","from localhost ([::1]:48235 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVW0-0002h0-BD\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:53:16 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46992)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVKn-0006Jt-7L\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVKj-00031R-LA\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:41 -0400","from mx1.redhat.com ([209.132.183.28]:50528)\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 1dsVKb-0002qY-9q; Thu, 14 Sep 2017 10:41:29 -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 54FD7821C1;\n\tThu, 14 Sep 2017 14:41:28 +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 BE35160841;\n\tThu, 14 Sep 2017 14:41:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 54FD7821C1","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:28 -0500","Message-Id":"<20170914144032.14945-17-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.28]);\n\tThu, 14 Sep 2017 14:41:28 +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 16/20] vdi: 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, qemu-block@nongnu.org,\n\tStefan Weil , Max Reitz ,\n\tjsnow@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 vdi driver accordingly. Note that the\nTODO is already covered (the block layer guarantees bounds of its\nrequests), and that we can remove the now-unused s->block_sectors.\n\nSigned-off-by: Eric Blake \n\n---\nv2: rebase to mapping flag\n---\n block/vdi.c | 28 +++++++++++-----------------\n 1 file changed, 11 insertions(+), 17 deletions(-)","diff":"diff --git a/block/vdi.c b/block/vdi.c\nindex 6f83221ddc..b571832127 100644\n--- a/block/vdi.c\n+++ b/block/vdi.c\n@@ -171,8 +171,6 @@ typedef struct {\n uint32_t *bmap;\n /* Size of block (bytes). */\n uint32_t block_size;\n- /* Size of block (sectors). */\n- uint32_t block_sectors;\n /* First sector of block map. */\n uint32_t bmap_sector;\n /* VDI header (converted to host endianness). */\n@@ -462,7 +460,6 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,\n bs->total_sectors = header.disk_size / SECTOR_SIZE;\n\n s->block_size = header.block_size;\n- s->block_sectors = header.block_size / SECTOR_SIZE;\n s->bmap_sector = header.offset_bmap / SECTOR_SIZE;\n s->header = header;\n\n@@ -508,23 +505,20 @@ static int vdi_reopen_prepare(BDRVReopenState *state,\n return 0;\n }\n\n-static int64_t coroutine_fn vdi_co_get_block_status(BlockDriverState *bs,\n- int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file)\n+static int64_t coroutine_fn vdi_co_block_status(BlockDriverState *bs,\n+ bool mapping,\n+ int64_t offset, int64_t bytes,\n+ int64_t *pnum,\n+ BlockDriverState **file)\n {\n- /* TODO: Check for too large sector_num (in bdrv_is_allocated or here). */\n BDRVVdiState *s = (BDRVVdiState *)bs->opaque;\n- size_t bmap_index = sector_num / s->block_sectors;\n- size_t sector_in_block = sector_num % s->block_sectors;\n- int n_sectors = s->block_sectors - sector_in_block;\n+ size_t bmap_index = offset / s->block_size;\n+ size_t index_in_block = offset % s->block_size;\n uint32_t bmap_entry = le32_to_cpu(s->bmap[bmap_index]);\n- uint64_t offset;\n int result;\n\n- logout(\"%p, %\" PRId64 \", %d, %p\\n\", bs, sector_num, nb_sectors, pnum);\n- if (n_sectors > nb_sectors) {\n- n_sectors = nb_sectors;\n- }\n- *pnum = n_sectors;\n+ logout(\"%p, %\" PRId64 \", %\" PRId64 \", %p\\n\", bs, offset, bytes, pnum);\n+ *pnum = MIN(s->block_size, bytes);\n result = VDI_IS_ALLOCATED(bmap_entry);\n if (!result) {\n return 0;\n@@ -532,7 +526,7 @@ static int64_t coroutine_fn vdi_co_get_block_status(BlockDriverState *bs,\n\n offset = s->header.offset_data +\n (uint64_t)bmap_entry * s->block_size +\n- sector_in_block * SECTOR_SIZE;\n+ (index_in_block & BDRV_BLOCK_OFFSET_MASK);\n *file = bs->file->bs;\n return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | offset;\n }\n@@ -902,7 +896,7 @@ static BlockDriver bdrv_vdi = {\n .bdrv_child_perm = bdrv_format_default_perms,\n .bdrv_create = vdi_create,\n .bdrv_has_zero_init = bdrv_has_zero_init_1,\n- .bdrv_co_get_block_status = vdi_co_get_block_status,\n+ .bdrv_co_block_status = vdi_co_block_status,\n .bdrv_make_empty = vdi_make_empty,\n\n .bdrv_co_preadv = vdi_co_preadv,\n","prefixes":["v3","16/20"]}