[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/19] block/sheepdog: Propagate errors through f
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 16/19] block/sheepdog: Propagate errors through find_vdi_name() |
Date: |
Fri, 16 May 2014 11:00:23 +0200 |
Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/sheepdog.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index d01cc88..b72c318 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1060,19 +1060,16 @@ static int parse_vdiname(BDRVSheepdogState *s, const
char *filename,
static int find_vdi_name(BDRVSheepdogState *s, const char *filename,
uint32_t snapid, const char *tag, uint32_t *vid,
- bool lock)
+ bool lock, Error **errp)
{
- Error *local_err = NULL;
int ret, fd;
SheepdogVdiReq hdr;
SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr;
unsigned int wlen, rlen = 0;
char buf[SD_MAX_VDI_LEN + SD_MAX_VDI_TAG_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;
}
@@ -1097,12 +1094,13 @@ static int find_vdi_name(BDRVSheepdogState *s, const
char *filename,
ret = do_req(fd, (SheepdogReq *)&hdr, buf, &wlen, &rlen);
if (ret) {
+ error_setg_errno(errp, -ret, "cannot get vdi info");
goto out;
}
if (rsp->result != SD_RES_SUCCESS) {
- error_report("cannot get vdi info, %s, %s %" PRIu32 " %s",
- sd_strerror(rsp->result), filename, snapid, tag);
+ error_setg(errp, "cannot get vdi info, %s, %s %" PRIu32 " %s",
+ sd_strerror(rsp->result), filename, snapid, tag);
if (rsp->result == SD_RES_NO_VDI) {
ret = -ENOENT;
} else {
@@ -1279,8 +1277,10 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t
snapid, const char *tag)
inode = g_malloc(sizeof(s->inode));
- ret = find_vdi_name(s, s->name, snapid, tag, &vid, false);
+ ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err);
if (ret) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto out;
}
@@ -1423,8 +1423,10 @@ static int sd_open(BlockDriverState *bs, QDict *options,
int flags,
goto out;
}
- ret = find_vdi_name(s, vdi, snapid, tag, &vid, true);
+ ret = find_vdi_name(s, vdi, snapid, tag, &vid, true, &local_err);
if (ret) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto out;
}
--
1.8.1.4
- [Qemu-devel] [PATCH v2 07/19] block/ssh: Propagate errors through authenticate(), (continued)
- [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, 2014/05/16
- [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 <=
- [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
- [Qemu-devel] [PATCH v2 02/19] blockdev: Don't use qerror_report() in do_drive_del(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 03/19] qemu-nbd: Don't use qerror_report(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 10/19] block/vvfat: Propagate errors through enable_write_target(), Markus Armbruster, 2014/05/16
- [Qemu-devel] [PATCH v2 05/19] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Markus Armbruster, 2014/05/16
- Re: [Qemu-devel] [PATCH v2 00/19] block: Purge qerror_report(), Stefan Hajnoczi, 2014/05/23