| Message ID | c9c0bd924a3467b39b5de6c025be6d7fd2de9dc0.1403041699.git.jcody@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Jun 17, 2014 at 05:53:50PM -0400, Jeff Cody wrote: > This is a small helper function, to determine if 'base' is in the > chain of BlockDriverState 'top'. It returns true if it is in the chain, > and false otherwise. > > If either argument is NULL, it will also return false. > > Reviewed-by: Benoit Canet <benoit@irqsave.net> > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > block.c | 11 +++++++++++ > include/block/block.h | 1 + > 2 files changed, 12 insertions(+) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
The Tuesday 17 Jun 2014 à 17:53:50 (-0400), Jeff Cody wrote : > This is a small helper function, to determine if 'base' is in the > chain of BlockDriverState 'top'. It returns true if it is in the chain, > and false otherwise. > > If either argument is NULL, it will also return false. > > Reviewed-by: Benoit Canet <benoit@irqsave.net> > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > block.c | 11 +++++++++++ > include/block/block.h | 1 + > 2 files changed, 12 insertions(+) > > diff --git a/block.c b/block.c > index da32bb0..280a167 100644 > --- a/block.c > +++ b/block.c > @@ -3819,6 +3819,17 @@ BlockDriverState *bdrv_lookup_bs(const char *device, > return NULL; > } > > +/* If 'base' is in the same chain as 'top', return true. Otherwise, > + * return false. If either argument is NULL, return false. */ > +bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base) > +{ > + while (top && top != base) { > + top = top->backing_hd; > + } > + > + return top != NULL; > +} > + > BlockDriverState *bdrv_next(BlockDriverState *bs) > { > if (!bs) { > diff --git a/include/block/block.h b/include/block/block.h > index f15b99b..c60bd52 100644 > --- a/include/block/block.h > +++ b/include/block/block.h > @@ -403,6 +403,7 @@ BlockDeviceInfoList *bdrv_named_nodes_list(void); > BlockDriverState *bdrv_lookup_bs(const char *device, > const char *node_name, > Error **errp); > +bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base); > BlockDriverState *bdrv_next(BlockDriverState *bs); > void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), > void *opaque); > -- > 1.9.3 > > I know I rev by this patch but it now appears we will probably need to extend this function to work with multiple children BDS. Jeff do you prefer to take care of this in this series or should I rework it later in my quorum maintainance series ? Best regards Benoît
diff --git a/block.c b/block.c index da32bb0..280a167 100644 --- a/block.c +++ b/block.c @@ -3819,6 +3819,17 @@ BlockDriverState *bdrv_lookup_bs(const char *device, return NULL; } +/* If 'base' is in the same chain as 'top', return true. Otherwise, + * return false. If either argument is NULL, return false. */ +bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base) +{ + while (top && top != base) { + top = top->backing_hd; + } + + return top != NULL; +} + BlockDriverState *bdrv_next(BlockDriverState *bs) { if (!bs) { diff --git a/include/block/block.h b/include/block/block.h index f15b99b..c60bd52 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -403,6 +403,7 @@ BlockDeviceInfoList *bdrv_named_nodes_list(void); BlockDriverState *bdrv_lookup_bs(const char *device, const char *node_name, Error **errp); +bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base); BlockDriverState *bdrv_next(BlockDriverState *bs); void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque);