From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux7-0005Uu-7a for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7Ux1-0001Rh-90 for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux0-0001RU-Vr for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:00:59 -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 s0QJ0wC6003241 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Jan 2014 14:00:58 -0500 From: Max Reitz Date: Sun, 26 Jan 2014 20:02:38 +0100 Message-Id: <1390762963-25538-6-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 05/10] block: Reuse reference handling 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 reference parameter and the related handling code from bdrv_file_open(), since it exists in bdrv_open() now as well. Signed-off-by: Max Reitz --- block.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/block.c b/block.c index c7219cb..6c29115 100644 --- a/block.c +++ b/block.c @@ -948,8 +948,7 @@ free_and_fail: * dictionary, it needs to use QINCREF() before calling bdrv_file_open. */ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, - const char *reference, QDict *options, int flags, - Error **errp) + QDict *options, int flags, Error **errp) { BlockDriverState *bs = NULL; BlockDriver *drv; @@ -958,24 +957,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, Error *local_err = NULL; int ret; - if (reference) { - if (filename || qdict_size(options)) { - error_setg(errp, "Cannot reference an existing block device with " - "additional options or a new filename"); - return -EINVAL; - } - QDECREF(options); - - bs = bdrv_find(reference); - if (!bs) { - error_setg(errp, "Cannot find block device '%s'", reference); - return -ENODEV; - } - bdrv_ref(bs); - *pbs = bs; - return 0; - } - bs = bdrv_new(""); bs->options = options; options = qdict_clone_shallow(options); @@ -1228,12 +1209,6 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } - if (flags & BDRV_O_PROTOCOL) { - assert(!drv); - return bdrv_file_open(pbs, filename, reference, options, - flags & ~BDRV_O_PROTOCOL, errp); - } - if (reference) { bool options_non_empty = qdict_size(options); QDECREF(options); @@ -1260,6 +1235,12 @@ 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 { -- 1.8.5.3