[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/55] vmdk: Improve error handling
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 10/55] vmdk: Improve error handling |
Date: |
Mon, 31 Oct 2011 14:29:45 +0100 |
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 01/55] iSCSI block driver, (continued)
- [Qemu-devel] [PATCH 01/55] iSCSI block driver, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 03/55] Teach block/vdi about "discarded" (no longer allocated) blocks, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 04/55] qcow2: fix some errors and typo in qcow2.txt, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 05/55] block: Remove dead code, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 06/55] block: Fix bdrv_open use after free, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 07/55] qcow: Fix bdrv_write_compressed error handling, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 09/55] vmdk: Fix use of uninitialised value, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 08/55] ide: Fix off-by-one error in array index check, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 12/55] Documentation: Describe NBD URL syntax, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 13/55] block: fix qcow2_co_flush deadlock, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 10/55] vmdk: Improve error handling,
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/55] vmdk: Fix possible segfaults, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 14/55] qemu-io: delete bs instead of leaking it, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 15/55] block: set bs->read_only before .bdrv_open(), Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 17/55] Documentation: Add syntax for using sheepdog devices, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 16/55] block: reinitialize across bdrv_close()/bdrv_open(), Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 18/55] scsi: pass correct sense code for ENOMEDIUM, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 35/55] scsi: allow arbitrary LUNs, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 33/55] scsi: remove devs array from SCSIBus, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 38/55] scsi-disk: fix retrying a flush, Kevin Wolf, 2011/10/31
- [Qemu-devel] [PATCH 37/55] scsi-disk: fail READ CAPACITY if LBA != 0 but PMI == 0, Kevin Wolf, 2011/10/31