Commit efde4b62 authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi
Browse files

block/sheepdog: Fix silent sd_open(), sd_create() failures 



Open and create methods must set an error when they fail.

Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent e67c3993

block/sheepdog.c

+5 −0
Original line number Diff line number Diff line
@@ -1412,6 +1412,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags, 
        ret = parse_vdiname(s, filename, vdi, &snapid, tag);

    }

    if (ret < 0) {

        error_setg(errp, "Can't parse filename");

        goto out;

    }

    s->fd = get_sheep_fd(s, errp);
@@ -1453,6 +1454,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags, 
    closesocket(fd);



    if (ret) {

        error_setg(errp, "Can't read snapshot inode");

        goto out;

    }
@@ -1654,6 +1656,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options, 
        ret = parse_vdiname(s, filename, s->name, &snapid, tag);

    }

    if (ret < 0) {

        error_setg(errp, "Can't parse filename");

        goto out;

    }
@@ -1677,6 +1680,8 @@ static int sd_create(const char *filename, QEMUOptionParameter *options, 
            if (options->value.s) {

                ret = parse_redundancy(s, options->value.s);

                if (ret < 0) {

                    error_setg(errp, "Invalid redundancy mode: '%s'",

                               options->value.s);

                    goto out;

                }

            }