{"id":813508,"url":"http://patchwork.ozlabs.org/api/patches/813508/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-11-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-11-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-13T16:03:20","name":"[v4,10/23] block: Switch bdrv_common_block_status_above() to byte-based","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1f7c2057d5d661a9ca94d68616f17607d63a0f9a","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-11-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/813508/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813508/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-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 [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 3xsmmf42jCz9sNV\n\tfor ;\n\tThu, 14 Sep 2017 02:08:34 +1000 (AEST)","from localhost ([::1]:43364 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsADH-0005f7-D5\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 12:08:31 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45830)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsA9P-0001eg-St\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsA9O-0006Ct-Tx\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:31 -0400","from mx1.redhat.com ([209.132.183.28]:57244)\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 1dsA9J-00068t-6b; Wed, 13 Sep 2017 12:04:25 -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 3C432C047B7F;\n\tWed, 13 Sep 2017 16:04:24 +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 01CD55C47C;\n\tWed, 13 Sep 2017 16:04:22 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3C432C047B7F","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 11:03:20 -0500","Message-Id":"<20170913160333.23622-11-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.31]);\n\tWed, 13 Sep 2017 16:04:24 +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 10/23] block: Switch\n\tbdrv_common_block_status_above() 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\nfunction (no semantic change).\n\nSigned-off-by: Eric Blake \nReviewed-by: Fam Zheng \n\n---\nv3: rebase to allocation/mapping sense change, simple enough to keep R-b\nv2: new patch\n---\n block/io.c | 41 +++++++++++++++++++++--------------------\n 1 file changed, 21 insertions(+), 20 deletions(-)","diff":"diff --git a/block/io.c b/block/io.c\nindex 0adfbb8e70..bc0e3fd0e2 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1962,19 +1962,18 @@ static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque)\n static int64_t bdrv_common_block_status_above(BlockDriverState *bs,\n BlockDriverState *base,\n bool mapping,\n- int64_t sector_num,\n- int nb_sectors, int *pnum,\n+ int64_t offset,\n+ int64_t bytes, int64_t *pnum,\n BlockDriverState **file)\n {\n Coroutine *co;\n- int64_t n;\n BdrvCoBlockStatusData data = {\n .bs = bs,\n .base = base,\n .file = file,\n- .offset = sector_num * BDRV_SECTOR_SIZE,\n- .bytes = nb_sectors * BDRV_SECTOR_SIZE,\n- .pnum = &n,\n+ .offset = offset,\n+ .bytes = bytes,\n+ .pnum = pnum,\n .mapping = mapping,\n .done = false,\n };\n@@ -1988,8 +1987,6 @@ 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@@ -1999,8 +1996,19 @@ int64_t bdrv_get_block_status_above(BlockDriverState *bs,\n int nb_sectors, int *pnum,\n BlockDriverState **file)\n {\n- return bdrv_common_block_status_above(bs, base, true, sector_num,\n- nb_sectors, pnum, file);\n+ int64_t ret;\n+ int64_t n;\n+\n+ ret = bdrv_common_block_status_above(bs, base, true,\n+ sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE,\n+ &n, file);\n+ if (ret < 0) {\n+ return ret;\n+ }\n+ assert(QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE));\n+ *pnum = n >> BDRV_SECTOR_BITS;\n+ return ret;\n }\n\n int64_t bdrv_block_status(BlockDriverState *bs,\n@@ -2025,20 +2033,13 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t offset,\n int64_t bytes, int64_t *pnum)\n {\n int64_t ret;\n- int psectors;\n+ int64_t dummy;\n\n- assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));\n- assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE) && bytes < INT_MAX);\n- ret = bdrv_common_block_status_above(bs, backing_bs(bs), false,\n- offset >> BDRV_SECTOR_BITS,\n- bytes >> BDRV_SECTOR_BITS, &psectors,\n- NULL);\n+ ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, offset,\n+ bytes, pnum ? pnum : &dummy, NULL);\n if (ret < 0) {\n return ret;\n }\n- if (pnum) {\n- *pnum = psectors * BDRV_SECTOR_SIZE;\n- }\n return !!(ret & BDRV_BLOCK_ALLOCATED);\n }\n\n","prefixes":["v4","10/23"]}