From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCBqV-0003Bh-0t for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:37:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCBqQ-0005Rk-0w for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:37:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCBqP-0005Re-Ns for qemu-devel@nongnu.org; Sat, 08 Feb 2014 12:37:33 -0500 From: Max Reitz Date: Sat, 8 Feb 2014 18:39:15 +0100 Message-Id: <1391881159-13585-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1391881159-13585-1-git-send-email-mreitz@redhat.com> References: <1391881159-13585-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/8] 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 , Jeff Cody , =?UTF-8?q?Beno=C3=AEt=20Canet?= , 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 Reviewed-by: Benoit Canet --- block.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/block.c b/block.c index 432d659..4c105bb 100644 --- a/block.c +++ b/block.c @@ -954,8 +954,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; @@ -969,24 +968,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } - 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); @@ -1235,12 +1216,6 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, assert(pbs); - 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 = options ? qdict_size(options) : false; QDECREF(options); @@ -1267,6 +1242,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.4