From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7UxD-0005e4-NF for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7Ux7-0001Sw-PK for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux7-0001Sk-HK for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:05 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0QJ13MR021624 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Jan 2014 14:01:04 -0500 From: Max Reitz Date: Sun, 26 Jan 2014 20:02:40 +0100 Message-Id: <1390762963-25538-8-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 07/10] block: Reuse fail path from bdrv_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 The fail paths of bdrv_file_open() and bdrv_open() naturally exhibit similarities, thus it is possible to reuse the one from bdrv_open() and shorten the one in bdrv_file_open() accordingly. Signed-off-by: Max Reitz --- block.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 72eddd5..0f2cd3f 100644 --- a/block.c +++ b/block.c @@ -1038,9 +1038,6 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename, fail: QDECREF(options); - if (!bs->drv) { - QDECREF(bs->options); - } return ret; } @@ -1240,17 +1237,17 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, if (flags & BDRV_O_PROTOCOL) { assert(!drv); ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL, - errp); + &local_err); + options = NULL; if (ret) { - if (*pbs) { - bdrv_close(bs); + if (bs->drv) { + goto close_and_fail; } else { - bdrv_unref(bs); + goto fail; } - } else { - *pbs = bs; } - return ret; + *pbs = bs; + return 0; } bs->options = options; -- 1.8.5.3