From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7UxB-0005Yn-GD for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7Ux4-0001SO-15 for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:65193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux3-0001SB-NI for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:01 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0QJ1066003543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Jan 2014 14:01:01 -0500 From: Max Reitz Date: Sun, 26 Jan 2014 20:02:39 +0100 Message-Id: <1390762963-25538-7-git-send-email-mreitz@redhat.com> In-Reply-To: <1390762963-25538-1-git-send-email-mreitz@redhat.com> References: <1390762963-25538-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 06/10] block: Remove bdrv_new() from bdrv_file_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Change bdrv_file_open() to take a simple pointer to an already existing BDS instead of an indirect one. The BDS will be created in bdrv_open() if necessary. Signed-off-by: Max Reitz --- block.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index 6c29115..72eddd5 100644 --- a/block.c +++ b/block.c @@ -947,17 +947,15 @@ free_and_fail: * after the call (even on failure), so if the caller intends to reuse the * dictionary, it needs to use QINCREF() before calling bdrv_file_open. */ -static int bdrv_file_open(BlockDriverState **pbs, const char *filename, +static int bdrv_file_open(BlockDriverState *bs, const char *filename, QDict *options, int flags, Error **errp) { - BlockDriverState *bs = NULL; BlockDriver *drv; const char *drvname; bool allow_protocol_prefix = false; Error *local_err = NULL; int ret; - bs = bdrv_new(""); bs->options = options; options = qdict_clone_shallow(options); @@ -1036,7 +1034,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, QDECREF(options); bs->growable = 1; - *pbs = bs; return 0; fail: @@ -1044,7 +1041,6 @@ fail: if (!bs->drv) { QDECREF(bs->options); } - bdrv_unref(bs); return ret; } @@ -1235,17 +1231,28 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, return 0; } - if (flags & BDRV_O_PROTOCOL) { - assert(!drv); - return bdrv_file_open(pbs, filename, options, flags & ~BDRV_O_PROTOCOL, - errp); - } - if (*pbs) { bs = *pbs; } else { bs = bdrv_new(""); } + + if (flags & BDRV_O_PROTOCOL) { + assert(!drv); + ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL, + errp); + if (ret) { + if (*pbs) { + bdrv_close(bs); + } else { + bdrv_unref(bs); + } + } else { + *pbs = bs; + } + return ret; + } + bs->options = options; options = qdict_clone_shallow(options); -- 1.8.5.3