From b9fe8a7a12f18adebba5616a3e9f44143a78c07e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 7 Oct 2014 13:59:09 +0200 Subject: blockdev: Eliminate drive_del() drive_del() has become a trivial wrapper around blk_unref(). Get rid of it. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Signed-off-by: Kevin Wolf --- blockdev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'blockdev.c') diff --git a/blockdev.c b/blockdev.c index 63f797b417..30382031b8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -134,7 +134,7 @@ void blockdev_auto_del(BlockDriverState *bs) DriveInfo *dinfo = blk_legacy_dinfo(blk); if (dinfo && dinfo->auto_del) { - drive_del(dinfo); + blk_unref(blk); } } @@ -276,11 +276,6 @@ static void bdrv_format_print(void *opaque, const char *name) error_printf(" %s", name); } -void drive_del(DriveInfo *dinfo) -{ - blk_unref(dinfo->bdrv->blk); -} - typedef struct { QEMUBH *bh; BlockDriverState *bs; @@ -1867,7 +1862,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) bdrv_set_on_error(bs, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT); } else { - drive_del(dinfo); + blk_unref(blk); } aio_context_release(aio_context); -- cgit v1.2.3-55-g7522