[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] vmdk: Improve error handling
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 6/7] vmdk: Improve error handling |
Date: |
Wed, 26 Oct 2011 14:31:21 +0200 |
Return the right error values in some more places.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vmdk.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 6cdbfb7..fa0e8bd 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -212,8 +212,10 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int
parent)
const char *p_name, *cid_str;
size_t cid_str_size;
BDRVVmdkState *s = bs->opaque;
+ int ret;
- if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
+ ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE);
+ if (ret < 0) {
return 0;
}
@@ -239,10 +241,12 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t
cid)
char desc[DESC_SIZE], tmp_desc[DESC_SIZE];
char *p_name, *tmp_str;
BDRVVmdkState *s = bs->opaque;
+ int ret;
memset(desc, 0, sizeof(desc));
- if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
- return -EIO;
+ ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE);
+ if (ret < 0) {
+ return ret;
}
tmp_str = strstr(desc, "parentCID");
@@ -254,9 +258,11 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t
cid)
pstrcat(desc, sizeof(desc), tmp_desc);
}
- if (bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE) < 0) {
- return -EIO;
+ ret = bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE);
+ if (ret < 0) {
+ return ret;
}
+
return 0;
}
@@ -1109,7 +1115,10 @@ static int vmdk_write(BlockDriverState *bs, int64_t
sector_num,
/* update CID on the first write every time the virtual disk is
* opened */
if (!s->cid_updated) {
- vmdk_write_cid(bs, time(NULL));
+ ret = vmdk_write_cid(bs, time(NULL));
+ if (ret < 0) {
+ return ret;
+ }
s->cid_updated = true;
}
}
--
1.7.6.4
- [Qemu-devel] [PATCH 1/7] block: Remove dead code, (continued)
- [Qemu-devel] [PATCH 1/7] block: Remove dead code, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 2/7] block: Fix bdrv_open use after free, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 4/7] ide: Fix off-by-one error in array index check, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 5/7] vmdk: Fix use of uninitialised value, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 6/7] vmdk: Improve error handling,
Kevin Wolf <=
- [Qemu-devel] [PATCH 7/7] vmdk: Fix possible segfaults, Kevin Wolf, 2011/10/26
- [Qemu-devel] [PATCH 3/7] qcow: Fix bdrv_write_compressed error handling, Kevin Wolf, 2011/10/26