diff options
author | Markus Armbruster <armbru@redhat.com> | 2014-05-16 11:00:21 +0200 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-05-28 14:28:47 +0200 |
commit | 318df29e103ab8a3a5fe25106d0120e956db31aa (patch) | |
tree | 90d410bb40ca0716c2b692989d47bdb34649b05d /block/sheepdog.c | |
parent | 356b4ca2bb8fe2e907a1dbdd7ed0a1a7f11c2645 (diff) | |
download | qemu-318df29e103ab8a3a5fe25106d0120e956db31aa.zip qemu-318df29e103ab8a3a5fe25106d0120e956db31aa.tar.gz qemu-318df29e103ab8a3a5fe25106d0120e956db31aa.tar.bz2 |
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>
Diffstat (limited to 'block/sheepdog.c')
-rw-r--r-- | block/sheepdog.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c index b932d68..4df45a1 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1537,21 +1537,18 @@ static int do_sd_create(BDRVSheepdogState *s, uint32_t *vdi_id, int snapshot) return 0; } -static int sd_prealloc(const char *filename) +static int sd_prealloc(const char *filename, Error **errp) { BlockDriverState *bs = NULL; uint32_t idx, max_idx; int64_t vdi_size; void *buf = g_malloc0(SD_DATA_OBJ_SIZE); - Error *local_err = NULL; int ret; ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL, - NULL, &local_err); + NULL, errp); if (ret < 0) { - qerror_report_err(local_err); - error_free(local_err); - goto out; + goto out_with_err_set; } vdi_size = bdrv_getlength(bs); @@ -1575,7 +1572,12 @@ static int sd_prealloc(const char *filename) goto out; } } + out: + if (ret < 0) { + error_setg_errno(errp, -ret, "Can't pre-allocate"); + } +out_with_err_set: if (bs) { bdrv_unref(bs); } @@ -1734,7 +1736,11 @@ static int sd_create(const char *filename, QEMUOptionParameter *options, 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: g_free(s); return ret; |