OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/sheepdog: Propagate errors through sd_prealloc() 

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:21 +02:00 committed by Stefan Hajnoczi
parent 356b4ca2bb
commit 318df29e10
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block/sheepdog.c
View File

@ -1537,21 +1537,18 @@ static int do_sd_create(BDRVSheepdogState *s, uint32_t *vdi_id, int snapshot)
return 0; return 0;
} }
static int sd_prealloc(const char *filename) static int sd_prealloc(const char *filename, Error **errp)
{ {
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
uint32_t idx, max_idx; uint32_t idx, max_idx;
int64_t vdi_size; int64_t vdi_size;
void *buf = g_malloc0(SD_DATA_OBJ_SIZE); void *buf = g_malloc0(SD_DATA_OBJ_SIZE);
Error *local_err = NULL;
int ret; int ret;
ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL, ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err); NULL, errp);
if (ret < 0) { if (ret < 0) {
qerror_report_err(local_err); goto out_with_err_set;
error_free(local_err);
goto out;
} }
vdi_size = bdrv_getlength(bs); vdi_size = bdrv_getlength(bs);
@ -1575,7 +1572,12 @@ static int sd_prealloc(const char *filename)
goto out; goto out;
} }
} }
out: out:
if (ret < 0) {
error_setg_errno(errp, -ret, "Can't pre-allocate");
}
out_with_err_set:
if (bs) { if (bs) {
bdrv_unref(bs); bdrv_unref(bs);
} }
@ -1734,7 +1736,11 @@ static int sd_create(const char *filename, QEMUOptionParameter *options,
goto out; goto out;
} }
ret = sd_prealloc(filename); ret = sd_prealloc(filename, &local_err);
if (ret < 0) {
qerror_report_err(local_err);
error_free(local_err);
}
out: out:
g_free(s); g_free(s);
return ret; return ret;