[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 4/5] block: Simplify use of BDRV_BLOCK_RAW
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v2 4/5] block: Simplify use of BDRV_BLOCK_RAW |
Date: |
Thu, 25 May 2017 14:35:38 +0800 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Wed, 05/24 15:28, Eric Blake wrote:
> The lone caller that cares about a return of BDRV_BLOCK_RAW
> (namely, io.c:bdrv_co_get_block_status) completely replaces the
> return value, so there is no point in passing BDRV_BLOCK_DATA.
>
> Signed-off-by: Eric Blake <address@hidden>
>
> ---
> v2: fix subject, tweak commit message
> ---
> block/commit.c | 2 +-
> block/mirror.c | 2 +-
> block/raw-format.c | 2 +-
> block/vpc.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/block/commit.c b/block/commit.c
> index 76a0d98..cf662ba 100644
> --- a/block/commit.c
> +++ b/block/commit.c
> @@ -239,7 +239,7 @@ static int64_t coroutine_fn
> bdrv_commit_top_get_block_status(
> {
> *pnum = nb_sectors;
> *file = bs->backing->bs;
> - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
> + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
> (sector_num << BDRV_SECTOR_BITS);
> }
>
> diff --git a/block/mirror.c b/block/mirror.c
> index 4563ba7..432d58d 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -1046,7 +1046,7 @@ static int64_t coroutine_fn
> bdrv_mirror_top_get_block_status(
> {
> *pnum = nb_sectors;
> *file = bs->backing->bs;
> - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
> + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
> (sector_num << BDRV_SECTOR_BITS);
> }
>
> diff --git a/block/raw-format.c b/block/raw-format.c
> index 36e6503..1136eba 100644
> --- a/block/raw-format.c
> +++ b/block/raw-format.c
> @@ -259,7 +259,7 @@ static int64_t coroutine_fn
> raw_co_get_block_status(BlockDriverState *bs,
> *pnum = nb_sectors;
> *file = bs->file->bs;
> sector_num += s->offset / BDRV_SECTOR_SIZE;
> - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
> + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
> (sector_num << BDRV_SECTOR_BITS);
> }
>
> diff --git a/block/vpc.c b/block/vpc.c
> index ecfee77..048504b 100644
> --- a/block/vpc.c
> +++ b/block/vpc.c
> @@ -701,7 +701,7 @@ static int64_t coroutine_fn
> vpc_co_get_block_status(BlockDriverState *bs,
> if (be32_to_cpu(footer->type) == VHD_FIXED) {
> *pnum = nb_sectors;
> *file = bs->file->bs;
> - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA |
> + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
> (sector_num << BDRV_SECTOR_BITS);
> }
>
> --
> 2.9.4
>
>
Reviewed-by: Fam Zheng <address@hidden>
- [Qemu-devel] [PATCH v2 0/5] more blkdebug tweaks, Eric Blake, 2017/05/24
- [Qemu-devel] [PATCH v2 1/5] qemu-io: Don't die on second open, Eric Blake, 2017/05/24
- [Qemu-devel] [PATCH v2 2/5] block: Guarantee that *file is set on bdrv_get_block_status(), Eric Blake, 2017/05/24
- [Qemu-devel] [PATCH v2 4/5] block: Simplify use of BDRV_BLOCK_RAW, Eric Blake, 2017/05/24
- [Qemu-devel] [PATCH v2 3/5] block: Allow NULL file for bdrv_get_block_status(), Eric Blake, 2017/05/24
- [Qemu-devel] [PATCH v2 5/5] blkdebug: Support .bdrv_co_get_block_status, Eric Blake, 2017/05/24
- Re: [Qemu-devel] [PATCH v2 0/5] more blkdebug tweaks, Fam Zheng, 2017/05/25