Commit dd67fa50 authored by Benoît Canet's avatar Benoît Canet Committed by Stefan Hajnoczi
Browse files

block: Relax bdrv_lookup_bs constraints. 



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: default avatarBenoit Canet <benoit@irqsave.net>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 57b6bdf3

block.c

+11 −15
Original line number Diff line number Diff line
@@ -3574,30 +3574,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;

        }

    }



    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)