On 08.01.2016 03:08, Fam Zheng wrote: > The added parameter can be used to return the BDS pointer which the > valid offset is referring to. Its value should be ignored unless > BDRV_BLOCK_OFFSET_VALID in ret is set. > > Until block drivers fill in the right value, let's clear it explicitly > right before calling .bdrv_get_block_status. > > The "bs->file" condition in bdrv_co_get_block_status is kept now to keep > iotest > case 102 passing, and will be fixed once all drivers return the right file > pointer. > > Signed-off-by: Fam Zheng <[email protected]> > --- > block/io.c | 38 ++++++++++++++++++++++++++------------ > block/iscsi.c | 6 ++++-- > block/mirror.c | 3 ++- > block/parallels.c | 2 +- > block/qcow.c | 2 +- > block/qcow2.c | 2 +- > block/qed.c | 3 ++- > block/raw-posix.c | 3 ++- > block/raw_bsd.c | 3 ++- > block/sheepdog.c | 2 +- > block/vdi.c | 2 +- > block/vmdk.c | 2 +- > block/vpc.c | 2 +- > block/vvfat.c | 2 +- > include/block/block.h | 11 +++++++---- > include/block/block_int.h | 3 ++- > qemu-img.c | 7 +++++-- > 17 files changed, 60 insertions(+), 33 deletions(-)
Patch itself is good, but the two bdrv_get_block_status_above() calls you added in qemu-img.c in 25ad8e6e need to be amended now, too. Max
signature.asc
Description: OpenPGP digital signature
