[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 30/33] block/sheepdog: Propagate errors through fi
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 30/33] block/sheepdog: Propagate errors through find_vdi_name() |
Date: |
Wed, 28 May 2014 14:32:40 +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, 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.9.3
- [Qemu-devel] [PULL v2 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, (continued)
- [Qemu-devel] [PULL v2 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 20/33] block/ssh: Propagate errors through check_host_key(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 21/33] block/ssh: Propagate errors through authenticate(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 22/33] block/ssh: Propagate errors through connect_to_ssh(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 23/33] block/ssh: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 24/33] block/vvfat: Propagate errors through enable_write_target(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 25/33] block/vvfat: Propagate errors through init_directories(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 18/33] block/rbd: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 26/33] block/sheepdog: Propagate errors through connect_to_sdog(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 27/33] block/sheepdog: Propagate errors through get_sheep_fd(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 30/33] block/sheepdog: Propagate errors through find_vdi_name(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 33/33] block/sheepdog: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 29/33] block/sheepdog: Propagate errors through do_sd_create(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 28/33] block/sheepdog: Propagate errors through sd_prealloc(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 32/33] block/sheepdog: Fix silent sd_open(), sd_create() failures, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 31/33] block/sheepdog: Propagate errors to open and create methods, Stefan Hajnoczi, 2014/05/28
- Re: [Qemu-devel] [PULL v2 00/33] Block patches, Peter Maydell, 2014/05/28