From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux4-0005Pn-DG for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7Uwy-0001R8-BK for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Uwy-0001R2-3I for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:00:56 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0QJ0teJ003142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Jan 2014 14:00:55 -0500 From: Max Reitz Date: Sun, 26 Jan 2014 20:02:37 +0100 Message-Id: <1390762963-25538-5-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 04/10] block: Reuse NULL options check 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 Remove the check whether options is NULL form bdrv_file_open() and rely on the one in bdrv_open() instead. Signed-off-by: Max Reitz --- block.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 0fb7892..c7219cb 100644 --- a/block.c +++ b/block.c @@ -958,11 +958,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, Error *local_err = NULL; int ret; - /* NULL means an empty set of options */ - if (options == NULL) { - options = qdict_new(); - } - if (reference) { if (filename || qdict_size(options)) { error_setg(errp, "Cannot reference an existing block device with " @@ -1228,17 +1223,17 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, const char *drvname; Error *local_err = NULL; + /* NULL means an empty set of options */ + if (options == NULL) { + options = qdict_new(); + } + if (flags & BDRV_O_PROTOCOL) { assert(!drv); return bdrv_file_open(pbs, filename, reference, options, flags & ~BDRV_O_PROTOCOL, errp); } - /* NULL means an empty set of options */ - if (options == NULL) { - options = qdict_new(); - } - if (reference) { bool options_non_empty = qdict_size(options); QDECREF(options); -- 1.8.5.3