[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 5/5] blkdebug: Support .bdrv_co_get_block_sta
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v2 5/5] blkdebug: Support .bdrv_co_get_block_status |
Date: |
Thu, 25 May 2017 14:37:19 +0800 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Wed, 05/24 15:28, Eric Blake wrote:
> Without a passthrough status of BDRV_BLOCK_RAW, anything wrapped by
> blkdebug appears 100% allocated as data. Better is treating it the
> same as the underlying file being wrapped.
>
> Update iotest 177 for the new expected output.
>
> Signed-off-by: Eric Blake <address@hidden>
>
> ---
> v2: tweak commit message
> ---
> block/blkdebug.c | 11 +++++++++++
> tests/qemu-iotests/177.out | 5 ++++-
> 2 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/block/blkdebug.c b/block/blkdebug.c
> index a5196e8..1ad8d65 100644
> --- a/block/blkdebug.c
> +++ b/block/blkdebug.c
> @@ -642,6 +642,16 @@ static int coroutine_fn
> blkdebug_co_pdiscard(BlockDriverState *bs,
> return bdrv_co_pdiscard(bs->file->bs, offset, count);
> }
>
> +static int64_t coroutine_fn blkdebug_co_get_block_status(
> + BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,
> + BlockDriverState **file)
> +{
> + *pnum = nb_sectors;
> + *file = bs->file->bs;
> + return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID |
> + (sector_num << BDRV_SECTOR_BITS);
> +}
> +
> static void blkdebug_close(BlockDriverState *bs)
> {
> BDRVBlkdebugState *s = bs->opaque;
> @@ -912,6 +922,7 @@ static BlockDriver bdrv_blkdebug = {
> .bdrv_co_flush_to_disk = blkdebug_co_flush,
> .bdrv_co_pwrite_zeroes = blkdebug_co_pwrite_zeroes,
> .bdrv_co_pdiscard = blkdebug_co_pdiscard,
> + .bdrv_co_get_block_status = blkdebug_co_get_block_status,
>
> .bdrv_debug_event = blkdebug_debug_event,
> .bdrv_debug_breakpoint = blkdebug_debug_breakpoint,
> diff --git a/tests/qemu-iotests/177.out b/tests/qemu-iotests/177.out
> index b754ed4..43a7778 100644
> --- a/tests/qemu-iotests/177.out
> +++ b/tests/qemu-iotests/177.out
> @@ -46,6 +46,9 @@ read 30408704/30408704 bytes at offset 80740352
> read 23068672/23068672 bytes at offset 111149056
> 22 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> Offset Length File
> -0 0x8000000 blkdebug::TEST_DIR/t.IMGFMT
> +0 0x800000 TEST_DIR/t.IMGFMT
> +0x900000 0x2400000 TEST_DIR/t.IMGFMT
> +0x3c00000 0x1100000 TEST_DIR/t.IMGFMT
> +0x6a00000 0x1600000 TEST_DIR/t.IMGFMT
> No errors were found on the image.
> *** done
> --
> 2.9.4
>
>
Reviewed-by: Fam Zheng <address@hidden>
- Re: [Qemu-devel] [PATCH v2 2/5] block: Guarantee that *file is set on bdrv_get_block_status(), (continued)