[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/33] block/sheepdog: Propagate errors through sd_pr
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 28/33] block/sheepdog: Propagate errors through sd_prealloc() |
Date: |
Fri, 23 May 2014 17:42:00 +0200 |
From: Markus Armbruster <address@hidden>
Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/sheepdog.c | 20 +++++++++++++-------
1 file 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;
--
1.9.0
- [Qemu-devel] [PULL 17/33] qemu-nbd: Don't use qerror_report(), (continued)
- [Qemu-devel] [PULL 17/33] qemu-nbd: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 18/33] block/rbd: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 20/33] block/ssh: Propagate errors through check_host_key(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 21/33] block/ssh: Propagate errors through authenticate(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 23/33] block/ssh: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 24/33] block/vvfat: Propagate errors through enable_write_target(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 25/33] block/vvfat: Propagate errors through init_directories(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 26/33] block/sheepdog: Propagate errors through connect_to_sdog(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 27/33] block/sheepdog: Propagate errors through get_sheep_fd(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 28/33] block/sheepdog: Propagate errors through sd_prealloc(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 29/33] block/sheepdog: Propagate errors through do_sd_create(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 30/33] block/sheepdog: Propagate errors through find_vdi_name(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 31/33] block/sheepdog: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 32/33] block/sheepdog: Fix silent sd_open(), sd_create() failures, Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 33/33] block/sheepdog: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/23
- [Qemu-devel] [PULL 22/33] block/ssh: Propagate errors through connect_to_ssh(), Stefan Hajnoczi, 2014/05/23
- Re: [Qemu-devel] [PULL 00/33] Block patches, Peter Maydell, 2014/05/27