[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/20] vhdx: correctly propagate errors
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/20] vhdx: correctly propagate errors |
Date: |
Sun, 9 Feb 2014 10:48:48 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/vhdx.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/block/vhdx.c b/block/vhdx.c
index 9ee0a61..de1a80a 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -402,9 +402,10 @@ int vhdx_update_headers(BlockDriverState *bs,
BDRVVHDXState *s,
}
/* opens the specified header block from the VHDX file header section */
-static int vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s)
+static void vhdx_parse_header(BlockDriverState *bs, BDRVVHDXState *s,
+ Error **errp)
{
- int ret = 0;
+ int ret;
VHDXHeader *header1;
VHDXHeader *header2;
bool h1_valid = false;
@@ -462,7 +463,6 @@ static int vhdx_parse_header(BlockDriverState *bs,
BDRVVHDXState *s)
} else if (!h1_valid && h2_valid) {
s->curr_header = 1;
} else if (!h1_valid && !h2_valid) {
- ret = -EINVAL;
goto fail;
} else {
/* If both headers are valid, then we choose the active one by the
@@ -473,27 +473,22 @@ static int vhdx_parse_header(BlockDriverState *bs,
BDRVVHDXState *s)
} else if (h2_seq > h1_seq) {
s->curr_header = 1;
} else {
- ret = -EINVAL;
goto fail;
}
}
vhdx_region_register(s, s->headers[s->curr_header]->log_offset,
s->headers[s->curr_header]->log_length);
-
- ret = 0;
-
goto exit;
fail:
- qerror_report(ERROR_CLASS_GENERIC_ERROR, "No valid VHDX header found");
+ error_setg_errno(errp, -ret, "No valid VHDX header found");
qemu_vfree(header1);
qemu_vfree(header2);
s->headers[0] = NULL;
s->headers[1] = NULL;
exit:
qemu_vfree(buffer);
- return ret;
}
@@ -878,7 +873,7 @@ static int vhdx_open(BlockDriverState *bs, QDict *options,
int flags,
int ret = 0;
uint32_t i;
uint64_t signature;
-
+ Error *local_err = NULL;
s->bat = NULL;
s->first_visible_write = true;
@@ -901,8 +896,10 @@ static int vhdx_open(BlockDriverState *bs, QDict *options,
int flags,
* header update */
vhdx_guid_generate(&s->session_guid);
- ret = vhdx_parse_header(bs, s);
- if (ret < 0) {
+ vhdx_parse_header(bs, s, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ ret = -EINVAL;
goto fail;
}
--
1.8.5.3
- [Qemu-devel] [PATCH 08/20] gluster: correctly propagate errors, (continued)
- [Qemu-devel] [PATCH 08/20] gluster: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 10/20] curl: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 11/20] qcow: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 12/20] qed: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 13/20] vhdx: correctly propagate errors,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 15/20] vmdk: extract vmdk_read_desc, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 16/20] vmdk: push vmdk_read_desc up to caller, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 17/20] vmdk: do not try opening a file as both image and descriptor, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 19/20] block: do not abuse EMEDIUMTYPE, Paolo Bonzini, 2014/02/09