From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyLJ-0001Vp-SV for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGyLE-0000RB-SA for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyLE-0000Qz-Id for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:08 -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 s1LMD8wq006673 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Feb 2014 17:13:08 -0500 From: Kevin Wolf Date: Fri, 21 Feb 2014 23:12:04 +0100 Message-Id: <1393020771-32712-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1393020771-32712-1-git-send-email-kwolf@redhat.com> References: <1393020771-32712-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 07/54] 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: kwolf@redhat.com From: 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 Reviewed-by: Benoit Canet Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index 29accdd..39f2b60 100644 --- a/block.c +++ b/block.c @@ -960,10 +960,9 @@ 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; @@ -975,7 +974,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } - bs = bdrv_new(""); bs->options = options; options = qdict_clone_shallow(options); @@ -1049,7 +1047,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, QDECREF(options); bs->growable = 1; - *pbs = bs; return 0; fail: @@ -1057,7 +1054,6 @@ fail: if (!bs->drv) { QDECREF(bs->options); } - bdrv_unref(bs); return ret; } @@ -1252,18 +1248,24 @@ 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 && !*pbs) { + bdrv_unref(bs); + } else if (!ret) { + *pbs = bs; + } + return ret; + } + /* NULL means an empty set of options */ if (options == NULL) { options = qdict_new(); -- 1.8.1.4