From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0q4O-0006QN-Ma for qemu-devel@nongnu.org; Wed, 08 Jan 2014 05:09:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0q4I-0008Em-Ag for qemu-devel@nongnu.org; Wed, 08 Jan 2014 05:09:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0q4I-0008Ea-0V for qemu-devel@nongnu.org; Wed, 08 Jan 2014 05:08:58 -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 s08A8uOx026568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 8 Jan 2014 05:08:57 -0500 From: Fam Zheng Date: Wed, 8 Jan 2014 18:07:48 +0800 Message-Id: <1389175672-25109-8-git-send-email-famz@redhat.com> In-Reply-To: <1389175672-25109-1-git-send-email-famz@redhat.com> References: <1389175672-25109-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v11 07/11] block: Parse "backing" option to reference existing BDS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, rjones@redhat.com, armbru@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com Now it's safe to allow reference for backing_hd in the interface. Signed-off-by: Fam Zheng --- block.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 2ccc006..ca4e362 100644 --- a/block.c +++ b/block.c @@ -1199,12 +1199,34 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, /* If there is a backing file, use it */ if ((flags & BDRV_O_NO_BACKING) == 0) { QDict *backing_options; + const char *backing_name; + BlockDriverState *backing_hd; + backing_name = qdict_get_try_str(options, "backing"); qdict_extract_subqdict(options, &backing_options, "backing."); - ret = bdrv_open_backing_file(bs, backing_options, &local_err); - if (ret < 0) { + + if (backing_name && qdict_size(backing_options)) { + error_setg(&local_err, + "Option \"backing\" and \"backing.*\" cannot be " + "used together"); + ret = -EINVAL; goto close_and_fail; } + if (backing_name) { + backing_hd = bdrv_find(backing_name); + if (!backing_hd) { + error_set(&local_err, QERR_DEVICE_NOT_FOUND, backing_name); + ret = -ENOENT; + goto close_and_fail; + } + qdict_del(options, "backing"); + bdrv_set_backing_hd(bs, backing_hd); + } else { + ret = bdrv_open_backing_file(bs, backing_options, &local_err); + if (ret < 0) { + goto close_and_fail; + } + } } /* Check if any unknown options were used */ -- 1.8.5.1