From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDcT0-0007Qh-6c for qemu-devel@nongnu.org; Wed, 12 Feb 2014 11:15:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDcSu-0006ZP-2M for qemu-devel@nongnu.org; Wed, 12 Feb 2014 11:15:18 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:49794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDcSt-0006XA-LA for qemu-devel@nongnu.org; Wed, 12 Feb 2014 11:15:11 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 12 Feb 2014 17:15:06 +0100 Message-Id: <1392221707-12916-2-git-send-email-benoit.canet@irqsave.net> In-Reply-To: <1392221707-12916-1-git-send-email-benoit.canet@irqsave.net> References: <1392221707-12916-1-git-send-email-benoit.canet@irqsave.net> Subject: [Qemu-devel] [PATCH 1/2] block: Relax bdrv_lookup_bs constraints. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , Benoit Canet , mreitz@redhat.com The following patch will reuse bdrv_lookup_bs in order to open images by references so the rules of usage of bdrv_lookup_bs must be relaxed a bit. Signed-off-by: Benoit Canet --- block.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index 3843f59..5ca901b 100644 --- a/block.c +++ b/block.c @@ -3579,30 +3579,26 @@ BlockDriverState *bdrv_lookup_bs(const char *device, { BlockDriverState *bs = NULL; - if ((!device && !node_name) || (device && node_name)) { - error_setg(errp, "Use either device or node-name but not both"); - return NULL; - } - if (device) { bs = bdrv_find(device); - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); - return NULL; + if (bs) { + return bs; } - - return bs; } - bs = bdrv_find_node(node_name); + if (node_name) { + bs = bdrv_find_node(node_name); - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, node_name); - return NULL; + if (bs) { + return bs; + } } - return bs; + error_setg(errp, "Cannot find device=%s nor node_name=%s", + device ? device : "", + node_name ? node_name : ""); + return NULL; } BlockDriverState *bdrv_next(BlockDriverState *bs) -- 1.8.3.2