From: Eric Blake <eblake@redhat.com>
To: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, ronniesahlberg@gmail.com,
codyprime@gmail.com, sw@weilnetz.de, pl@kamp.de,
qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com,
pbonzini@redhat.com, den@openvz.org
Subject: Re: [PATCH v2 2/9] block: inline bdrv_unallocated_blocks_are_zero()
Date: Thu, 7 May 2020 09:08:44 -0500 [thread overview]
Message-ID: <066235a9-72ee-f9bc-7d5b-1f664a7d36b7@redhat.com> (raw)
In-Reply-To: <20200507084800.20596-3-vsementsov@virtuozzo.com>
On 5/7/20 3:47 AM, Vladimir Sementsov-Ogievskiy wrote:
> The function has the only user: bdrv_co_block_status(). Inline it to
s/the only/only one/
> simplify reviewing of the following patches, which will finally drop
> unallocated_blocks_are_zero field too.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> include/block/block.h | 1 -
> block.c | 15 ---------------
> block/io.c | 11 ++++++++---
> 3 files changed, 8 insertions(+), 19 deletions(-)
>
> +++ b/block/io.c
> @@ -2386,15 +2386,20 @@ static int coroutine_fn bdrv_co_block_status(BlockDriverState *bs,
> if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) {
> ret |= BDRV_BLOCK_ALLOCATED;
> } else if (want_zero) {
> - if (bdrv_unallocated_blocks_are_zero(bs)) {
> - ret |= BDRV_BLOCK_ZERO;
> - } else if (bs->backing) {
> + if (bs->backing) {
> BlockDriverState *bs2 = bs->backing->bs;
> int64_t size2 = bdrv_getlength(bs2);
>
> if (size2 >= 0 && offset >= size2) {
> ret |= BDRV_BLOCK_ZERO;
> }
> + } else {
> + BlockDriverInfo bdi;
> + int ret2 = bdrv_get_info(bs, &bdi);
> +
> + if (ret2 == 0 && bdi.unallocated_blocks_are_zero) {
Could perhaps condense to:
else {
BlockDriverInfo bdi;
if (bdrv_get_info(bs, &bd) == 0 &&
bdi.unallocated_blocks_are_zero) {
but that's cosmetic.
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2020-05-07 14:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 8:47 [PATCH v2 0/9] drop unallocated_blocks_are_zero Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 1/9] qemu-img: convert: don't use unallocated_blocks_are_zero Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 2/9] block: inline bdrv_unallocated_blocks_are_zero() Vladimir Sementsov-Ogievskiy
2020-05-07 14:08 ` Eric Blake [this message]
2020-05-28 9:31 ` Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 3/9] block/vdi: return ZERO block-status when appropriate Vladimir Sementsov-Ogievskiy
2020-05-07 14:10 ` Eric Blake
2020-05-07 8:47 ` [PATCH v2 4/9] block/vpc: " Vladimir Sementsov-Ogievskiy
2020-05-07 14:11 ` Eric Blake
2020-05-07 8:47 ` [PATCH v2 5/9] block/crypto: drop unallocated_blocks_are_zero Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 6/9] block/iscsi: " Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 7/9] block/file-posix: " Vladimir Sementsov-Ogievskiy
2020-05-07 8:47 ` [PATCH v2 8/9] block/vhdx: " Vladimir Sementsov-Ogievskiy
2020-05-07 8:48 ` [PATCH v2 9/9] block: " Vladimir Sementsov-Ogievskiy
2020-05-07 14:21 ` Eric Blake
2020-05-07 14:45 ` [PATCH v2 10/9] qed: Simplify backing reads Eric Blake
2020-05-07 15:22 ` Eric Blake
2020-05-07 18:22 ` Vladimir Sementsov-Ogievskiy
2020-05-19 17:40 ` [PATCH v2 0/9] drop unallocated_blocks_are_zero Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=066235a9-72ee-f9bc-7d5b-1f664a7d36b7@redhat.com \
--to=eblake@redhat.com \
--cc=codyprime@gmail.com \
--cc=den@openvz.org \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=ronniesahlberg@gmail.com \
--cc=stefanha@redhat.com \
--cc=sw@weilnetz.de \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).