From patchwork Tue Feb 18 17:33:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 321581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0CA6C2C00CC for ; Wed, 19 Feb 2014 04:34:06 +1100 (EST) Received: from localhost ([::1]:52104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFoYV-0008GP-LO for incoming@patchwork.ozlabs.org; Tue, 18 Feb 2014 12:34:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFoXn-0007zk-AF for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:33:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFoXh-0004hz-TP for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:33:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFoXh-0004ho-Li for qemu-devel@nongnu.org; Tue, 18 Feb 2014 12:33:13 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1IHVBl0018377 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Feb 2014 12:31:11 -0500 Received: from localhost (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1IHV6dV020661 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Tue, 18 Feb 2014 12:31:09 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Tue, 18 Feb 2014 18:33:08 +0100 Message-Id: <1392744792-9512-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1392744792-9512-1-git-send-email-mreitz@redhat.com> References: <1392744792-9512-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v4 4/8] block: Reuse reference handling from bdrv_open() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Kevin Wolf --- block.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/block.c b/block.c index 6f85d37..f38776b 100644 --- a/block.c +++ b/block.c @@ -961,8 +961,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; @@ -976,23 +975,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_lookup_bs(reference, reference, errp); - if (!bs) { - return -ENODEV; - } - bdrv_ref(bs); - *pbs = bs; - return 0; - } - bs = bdrv_new(""); bs->options = options; options = qdict_clone_shallow(options); @@ -1245,12 +1227,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); @@ -1276,6 +1252,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 {