ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-16 11:00:25 +02:00 committed by Stefan Hajnoczi
parent e67c399363
commit efde4b6252
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/sheepdog.c
View File

@ -1412,6 +1412,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags,
ret = parse_vdiname(s, filename, vdi, &snapid, tag); ret = parse_vdiname(s, filename, vdi, &snapid, tag);
} }
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Can't parse filename");
goto out; goto out;
} }
s->fd = get_sheep_fd(s, errp); s->fd = get_sheep_fd(s, errp);
@ -1453,6 +1454,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags,
closesocket(fd); closesocket(fd);
if (ret) { if (ret) {
error_setg(errp, "Can't read snapshot inode");
goto out; goto out;
} }
@ -1654,6 +1656,7 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
ret = parse_vdiname(s, filename, s->name, &snapid, tag); ret = parse_vdiname(s, filename, s->name, &snapid, tag);
} }
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Can't parse filename");
goto out; goto out;
} }
@ -1677,6 +1680,8 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
if (options->value.s) { if (options->value.s) {
ret = parse_redundancy(s, options->value.s); ret = parse_redundancy(s, options->value.s);
if (ret < 0) { if (ret < 0) {
error_setg(errp, "Invalid redundancy mode: '%s'",
options->value.s);
goto out; goto out;
} }
} }