[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/7] qcow2: Remove unused Error variable in do_pe
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v2 1/7] qcow2: Remove unused Error variable in do_perform_cow() |
Date: |
Wed, 7 Jun 2017 17:08:22 +0300 |
We are using the return value of qcow2_encrypt_sectors() to detect
problems but we are throwing away the returned Error since we have no
way to report it to the user. Therefore we can simply get rid of the
local Error variable and pass NULL instead.
Alternatively we could try to figure out a way to pass the original
error instead of simply returning -EIO, but that would be more
invasive, so let's keep the current approach.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/qcow2-cluster.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index d779ea19cf..d1c419f52b 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -440,16 +440,14 @@ static int coroutine_fn do_perform_cow(BlockDriverState
*bs,
}
if (bs->encrypted) {
- Error *err = NULL;
int64_t sector = (src_cluster_offset + offset_in_cluster)
>> BDRV_SECTOR_BITS;
assert(s->cipher);
assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0);
assert((bytes & ~BDRV_SECTOR_MASK) == 0);
if (qcow2_encrypt_sectors(s, sector, iov.iov_base, iov.iov_base,
- bytes >> BDRV_SECTOR_BITS, true, &err) < 0) {
+ bytes >> BDRV_SECTOR_BITS, true, NULL) < 0) {
ret = -EIO;
- error_free(err);
goto out;
}
}
--
2.11.0
- [Qemu-devel] [PATCH v2 0/7] qcow2: Reduce the number of I/O ops when doing COW, Alberto Garcia, 2017/06/07
- [Qemu-devel] [PATCH v2 1/7] qcow2: Remove unused Error variable in do_perform_cow(),
Alberto Garcia <=
- [Qemu-devel] [PATCH v2 6/7] qcow2: Pass a QEMUIOVector to do_perform_cow_{read, write}(), Alberto Garcia, 2017/06/07
- [Qemu-devel] [PATCH v2 7/7] qcow2: Merge the writing of the COW regions with the guest data, Alberto Garcia, 2017/06/07
- [Qemu-devel] [PATCH v2 5/7] qcow2: Allow reading both COW regions with only one request, Alberto Garcia, 2017/06/07
- [Qemu-devel] [PATCH v2 4/7] qcow2: Split do_perform_cow() into _read(), _encrypt() and _write(), Alberto Garcia, 2017/06/07