diff options
author | Kevin Wolf <kwolf@redhat.com> | 2015-10-13 14:09:44 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-16 15:34:30 +0200 |
commit | 779020cbdc67011026c10fb620f701bfc6b85547 (patch) | |
tree | dbfe62a69c310d81f0752b5780df5f95e01bc510 /block.c | |
parent | 8e419aefa07ca8e640f8db50b450378e84d60a11 (diff) | |
download | qemu-779020cbdc67011026c10fb620f701bfc6b85547.zip qemu-779020cbdc67011026c10fb620f701bfc6b85547.tar.gz qemu-779020cbdc67011026c10fb620f701bfc6b85547.tar.bz2 |
block: Allow bdrv_unref_child(bs, NULL)
bdrv_unref() can be called with a NULL argument and doesn't do anything
then. Make bdrv_unref_child() consistent with it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r-- | block.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1104,12 +1104,17 @@ static void bdrv_detach_child(BdrvChild *child) void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child) { - BlockDriverState *child_bs = child->bs; + BlockDriverState *child_bs; + + if (child == NULL) { + return; + } if (child->bs->inherits_from == parent) { child->bs->inherits_from = NULL; } + child_bs = child->bs; bdrv_detach_child(child); bdrv_unref(child_bs); } |