[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/19] block/sheepdog: Propagate errors through d
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 15/19] block/sheepdog: Propagate errors through do_sd_create() |
Date: |
Fri, 16 May 2014 11:00:22 +0200 |
Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/sheepdog.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 4df45a1..d01cc88 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1481,19 +1481,17 @@ out:
return ret;
}
-static int do_sd_create(BDRVSheepdogState *s, uint32_t *vdi_id, int snapshot)
+static int do_sd_create(BDRVSheepdogState *s, uint32_t *vdi_id, int snapshot,
+ Error **errp)
{
- Error *local_err = NULL;
SheepdogVdiReq hdr;
SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr;
int fd, ret;
unsigned int wlen, rlen = 0;
char buf[SD_MAX_VDI_LEN];
- fd = connect_to_sdog(s, &local_err);
+ fd = connect_to_sdog(s, errp);
if (fd < 0) {
- qerror_report_err(local_err);
- error_free(local_err);
return fd;
}
@@ -1522,11 +1520,12 @@ static int do_sd_create(BDRVSheepdogState *s, uint32_t
*vdi_id, int snapshot)
closesocket(fd);
if (ret) {
+ error_setg_errno(errp, -ret, "create failed");
return ret;
}
if (rsp->result != SD_RES_SUCCESS) {
- error_report("%s, %s", sd_strerror(rsp->result), s->inode.name);
+ error_setg(errp, "%s, %s", sd_strerror(rsp->result), s->inode.name);
return -EIO;
}
@@ -1731,15 +1730,19 @@ static int sd_create(const char *filename,
QEMUOptionParameter *options,
bdrv_unref(bs);
}
- ret = do_sd_create(s, &vid, 0);
- if (!prealloc || ret) {
+ ret = do_sd_create(s, &vid, 0, &local_err);
+ if (ret) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto out;
}
- ret = sd_prealloc(filename, &local_err);
- if (ret < 0) {
- qerror_report_err(local_err);
- error_free(local_err);
+ if (prealloc) {
+ ret = sd_prealloc(filename, &local_err);
+ if (ret < 0) {
+ qerror_report_err(local_err);
+ error_free(local_err);
+ }
}
out:
g_free(s);
@@ -1928,8 +1931,10 @@ static int sd_create_branch(BDRVSheepdogState *s)
* false bail out.
*/
deleted = sd_delete(s);
- ret = do_sd_create(s, &vid, !deleted);
+ ret = do_sd_create(s, &vid, !deleted, &local_err);
if (ret) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto out;
}
@@ -2197,8 +2202,10 @@ static int sd_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info)
goto cleanup;
}
- ret = do_sd_create(s, &new_vid, 1);
+ ret = do_sd_create(s, &new_vid, 1, &local_err);
if (ret < 0) {
+ qerror_report_err(local_err);
+ error_free(local_err);
error_report("failed to create inode for snapshot. %s",
strerror(errno));
goto cleanup;
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/19] block: Purge qerror_report(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 04/19] block/rbd: Propagate errors to open and create methods, Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 08/19] block/ssh: Propagate errors through connect_to_ssh(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 19/19] block/sheepdog: Don't use qerror_report(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 09/19] block/ssh: Propagate errors to open and create methods, Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 07/19] block/ssh: Propagate errors through authenticate(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 17/19] block/sheepdog: Propagate errors to open and create methods, Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 15/19] block/sheepdog: Propagate errors through do_sd_create(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 14/19] block/sheepdog: Propagate errors through sd_prealloc(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 12/19] block/sheepdog: Propagate errors through connect_to_sdog(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 18/19] block/sheepdog: Fix silent sd_open(), sd_create() failures, Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 13/19] block/sheepdog: Propagate errors through get_sheep_fd(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 16/19] block/sheepdog: Propagate errors through find_vdi_name(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 11/19] block/vvfat: Propagate errors through init_directories(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 06/19] block/ssh: Propagate errors through check_host_key(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 01/19] blockdev: Don't use qerror_report_err() in drive_init(), Markus Armbruster, 2014/05/16