[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/7] qcow2: Remove unused Error in do_perform_cow()
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH 1/7] qcow2: Remove unused Error in do_perform_cow() |
Date: |
Tue, 23 May 2017 13:22:56 +0200 |
qcow2_encrypt_sectors() does not need an Error parameter, and we're
not checking its value anyway, so we can safely remove it.
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 347d94b0d2..3dc170e421 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-block] [PATCH 0/7] qcow2: Reduce the number of I/O ops when doing COW, Alberto Garcia, 2017/05/23
- [Qemu-block] [PATCH 1/7] qcow2: Remove unused Error in do_perform_cow(),
Alberto Garcia <=
- [Qemu-block] [PATCH 5/7] qcow2: Allow reading both COW regions with only one request, Alberto Garcia, 2017/05/23
- [Qemu-block] [PATCH 6/7] qcow2: Pass a QEMUIOVector to do_perform_cow_{read, write}(), Alberto Garcia, 2017/05/23
- [Qemu-block] [PATCH 2/7] qcow2: Use unsigned int for both members of Qcow2COWRegion, Alberto Garcia, 2017/05/23
- [Qemu-block] [PATCH 7/7] qcow2: Merge the writing of the COW regions with the guest data, Alberto Garcia, 2017/05/23
- Re: [Qemu-block] [PATCH 7/7] qcow2: Merge the writing of the COW regions with the guest data, Alberto Garcia, 2017/05/26