From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anrhy-0000xP-RQ for qemu-devel@nongnu.org; Wed, 06 Apr 2016 13:57:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anrhu-0006WJ-7B for qemu-devel@nongnu.org; Wed, 06 Apr 2016 13:57:38 -0400 From: Max Reitz Date: Wed, 6 Apr 2016 19:57:10 +0200 Message-Id: <1459965434-21531-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1459965434-21531-1-git-send-email-mreitz@redhat.com> References: <1459965434-21531-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 for-2.7 4/8] block: Drop blk_new_with_bs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Its only caller is blk_new_open(), so we can just inline it there. Signed-off-by: Max Reitz --- block/block-backend.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 66b8bad..4e8e8ab 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -175,26 +175,6 @@ BlockBackend *blk_new(Error **errp) } /* - * Create a new BlockBackend with a new BlockDriverState attached. - * Otherwise just like blk_new(), which see. - */ -BlockBackend *blk_new_with_bs(Error **errp) -{ - BlockBackend *blk; - BlockDriverState *bs; - - blk = blk_new(errp); - if (!blk) { - return NULL; - } - - bs = bdrv_new_root(); - blk->root = bdrv_root_attach_child(bs, "root", &child_root); - blk->root->opaque = blk; - return blk; -} - -/* * Calls blk_new_with_bs() and then calls bdrv_open() on the BlockDriverState. * * Just as with bdrv_open(), after having called this function the reference to @@ -210,21 +190,25 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, QDict *options, int flags, Error **errp) { BlockBackend *blk; + BlockDriverState *bs; int ret; - blk = blk_new_with_bs(errp); + blk = blk_new(errp); if (!blk) { QDECREF(options); return NULL; } - ret = bdrv_open(&blk->root->bs, filename, reference, options, flags, errp); + bs = NULL; + ret = bdrv_open(&bs, filename, reference, options, flags, errp); if (ret < 0) { blk_unref(blk); return NULL; } blk_set_enable_write_cache(blk, true); + blk->root = bdrv_root_attach_child(bs, "root", &child_root); + blk->root->opaque = blk; return blk; } -- 2.8.0