From 9ba10c95a4a63ef453893ba16bf1c8e11a1d3c39 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 7 Oct 2014 13:59:08 +0200 Subject: block: Make BlockBackend own its BlockDriverState On BlockBackend destruction, unref its BlockDriverState. Replaces the callers' unrefs. This turns the pointer from BlockBackend to BlockDriverState into a strong reference, managed with bdrv_ref() / bdrv_unref(). The back-pointer remains weak. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- blockdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'blockdev.c') diff --git a/blockdev.c b/blockdev.c index a00461df7b..63f797b417 100644 --- a/blockdev.c +++ b/blockdev.c @@ -278,10 +278,7 @@ static void bdrv_format_print(void *opaque, const char *name) void drive_del(DriveInfo *dinfo) { - BlockBackend *blk = dinfo->bdrv->blk; - - bdrv_unref(dinfo->bdrv); - blk_unref(blk); + blk_unref(dinfo->bdrv->blk); } typedef struct { @@ -583,7 +580,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, return blk; err: - bdrv_unref(bs); blk_unref(blk); early_err: qemu_opts_del(opts); @@ -2608,7 +2604,6 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) } if (bdrv_key_required(blk_bs(blk))) { - bdrv_unref(blk_bs(blk)); blk_unref(blk); error_setg(errp, "blockdev-add doesn't support encrypted devices"); goto fail; -- cgit v1.2.1