cd9d161514
Fix systemtap tapsets (bz 831763) Fix qmp response race caused by spice server bug (bz 744015) Fix text mode screendumps (bz 819155) Don't renable ksm on update (bz 815156) Fix RPM install error on non-virt machines (bz 660629) Obsolete openbios to fix upgrade dependency issues (bz 694802)
80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
From 2139ef7f75ff63904fac6b451c8a89e4b0c72448 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Wed, 26 Oct 2011 12:25:25 +0200
|
|
Subject: [PATCH] vmdk: Improve error handling
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Return the right error values in some more places.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit 99f1835d9bc744f98370254600530e66f32e6d81)
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
block/vmdk.c | 21 +++++++++++++++------
|
|
1 file changed, 15 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
index b5caa40..8284747 100644
|
|
--- a/block/vmdk.c
|
|
+++ b/block/vmdk.c
|
|
@@ -181,8 +181,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;
|
|
}
|
|
|
|
@@ -208,10 +210,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");
|
|
@@ -223,9 +227,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;
|
|
}
|
|
|
|
@@ -906,7 +912,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.11.2
|
|
|