Am 25.07.2013 um 16:23 hat Paolo Bonzini geschrieben: > Now that bdrv_is_allocated detects coroutine context, the two can > use the same code. > > Reviewed-by: Eric Blake <ebl...@redhat.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > block.c | 46 ++++------------------------------------------ > block/commit.c | 6 +++--- > block/mirror.c | 4 ++-- > block/stream.c | 4 ++-- > include/block/block.h | 4 ---- > 5 files changed, 11 insertions(+), 53 deletions(-) > > diff --git a/block.c b/block.c > index dd4c570..1ee1d93 100644 > --- a/block.c > +++ b/block.c > @@ -3058,10 +3058,10 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t > sector_num, int nb_sectors, > * allocated/unallocated state. > * > */ > -int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, > - BlockDriverState *base, > - int64_t sector_num, > - int nb_sectors, int *pnum) > +int coroutine_fn bdrv_is_allocated_above(BlockDriverState *top, > + BlockDriverState *base, > + int64_t sector_num, > + int nb_sectors, int *pnum)
This is no longer a coroutine_fn. However, if this was the only reason for making bdrv_is_allocated() a hybrid function, it may be easier to simply let the only caller (img_compare in qemu-img) run in a coroutine and drop the synchronous version entirely, keeping only a coroutine_fn. Kevin
