On 09/13/2013 04:25 AM, Peter Lieven wrote: > if a raw device like an iscsi target or host device is used > the current implementation makes a second call out to get > the block status of bs->file. however, the raw driver already > has called bdrv_get_block_status on bs->file. > > Signed-off-by: Peter Lieven <p...@kamp.de> > --- > block.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Eric Blake <ebl...@redhat.com> > > diff --git a/block.c b/block.c > index cf9db62..282943b 100644 > --- a/block.c > +++ b/block.c > @@ -3167,7 +3167,8 @@ static int64_t coroutine_fn > bdrv_co_get_block_status(BlockDriverState *bs, > > if (bs->file && > (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && > - (ret & BDRV_BLOCK_OFFSET_VALID)) { > + (ret & BDRV_BLOCK_OFFSET_VALID) && > + strcmp(bs->drv->format_name, "raw")) { > ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS, > *pnum, pnum); > if (ret2 >= 0) { > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature