From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEMiA-0002Ch-V8 for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:38:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEMi5-0007Ed-QX for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:38:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEMi5-0007ET-He for qemu-devel@nongnu.org; Fri, 14 Feb 2014 12:37:57 -0500 From: Stefan Hajnoczi Date: Fri, 14 Feb 2014 18:29:32 +0100 Message-Id: <1392398973-15092-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1392398973-15092-1-git-send-email-stefanha@redhat.com> References: <1392398973-15092-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 10/11] block: Relax bdrv_lookup_bs constraints. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Beno=C3=AEt Canet 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 Reviewed-by: Max Reitz Signed-off-by: Stefan Hajnoczi --- block.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index 636aa11..ba2aecf 100644 --- a/block.c +++ b/block.c @@ -3574,30 +3574,26 @@ BlockDriverState *bdrv_lookup_bs(const char *devi= ce, { BlockDriverState *bs =3D NULL; =20 - if ((!device && !node_name) || (device && node_name)) { - error_setg(errp, "Use either device or node-name but not both"); - return NULL; - } - if (device) { bs =3D bdrv_find(device); =20 - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); - return NULL; + if (bs) { + return bs; } - - return bs; } =20 - bs =3D bdrv_find_node(node_name); + if (node_name) { + bs =3D bdrv_find_node(node_name); =20 - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, node_name); - return NULL; + if (bs) { + return bs; + } } =20 - return bs; + error_setg(errp, "Cannot find device=3D%s nor node_name=3D%s", + device ? device : "", + node_name ? node_name : ""); + return NULL; } =20 BlockDriverState *bdrv_next(BlockDriverState *bs) --=20 1.8.5.3