Am 16.02.2016 um 19:08 hat Max Reitz geschrieben: > This function iterates over all BDSs attached to a BB. We are going to > need it when rewriting bdrv_next() so it no longer uses bdrv_states. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > block/block-backend.c | 24 ++++++++++++++++++++++++ > include/sysemu/block-backend.h | 1 + > 2 files changed, 25 insertions(+) > > diff --git a/block/block-backend.c b/block/block-backend.c > index a918c35..d1621ec 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -269,6 +269,30 @@ BlockBackend *blk_next(BlockBackend *blk) > } > > /* > + * Iterates over all BlockDriverStates which are attached to a BlockBackend. > + * This function is for use by bdrv_next(). > + * > + * @bs must be NULL or a BDS that is attached to a BB. > + */ > +BlockDriverState *blk_next_root_bs(BlockDriverState *bs) > +{ > + BlockBackend *blk; > + > + if (bs) { > + assert(bs->blk); > + blk = bs->blk;
I'm trying to remove bs->blk, and you're adding new instances. :-/ This isn't going to be an easy one to remove. But of course, it wouldn't be easy for you to avoid it either, so unless you have a good idea, let's apply this and we'll figure out how to get rid of it again. > + } else { > + blk = NULL; > + } > + > + do { > + blk = blk_all_next(blk); > + } while (blk && !blk->bs); > + > + return blk ? blk->bs : NULL; > +} Kevin