[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/10] block/mirror: replace IOV_MAX with blk_get_max
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 05/10] block/mirror: replace IOV_MAX with blk_get_max_iov() |
Date: |
Tue, 22 Dec 2015 16:54:15 +0800 |
Use blk_get_max_iov() instead of hardcoding IOV_MAX, which may not apply
to all BlockDrivers.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/mirror.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index fc34a9c..f201f2b 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -161,13 +161,15 @@ static void mirror_read_complete(void *opaque, int ret)
static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
{
BlockDriverState *source = s->common.bs;
- int nb_sectors, sectors_per_chunk, nb_chunks;
+ int nb_sectors, sectors_per_chunk, nb_chunks, max_iov;
int64_t end, sector_num, next_chunk, next_sector, hbitmap_next_sector;
uint64_t delay_ns = 0;
MirrorOp *op;
int pnum;
int64_t ret;
+ max_iov = MIN(source->bl.max_iov, s->target->bl.max_iov);
+
s->sector_num = hbitmap_iter_next(&s->hbi);
if (s->sector_num < 0) {
bdrv_dirty_iter_init(s->dirty_bitmap, &s->hbi);
@@ -248,7 +250,7 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
trace_mirror_break_buf_busy(s, nb_chunks, s->in_flight);
break;
}
- if (IOV_MAX < nb_chunks + added_chunks) {
+ if (max_iov < nb_chunks + added_chunks) {
trace_mirror_break_iov_max(s, nb_chunks, added_chunks);
break;
}
--
2.5.0
- [Qemu-devel] [PULL 00/10] Block patches, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 01/10] virtio-blk: trivial code optimization, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 02/10] block: add BlockLimits.max_iov field, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 03/10] block-backend: add blk_get_max_iov(), Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 04/10] block: replace IOV_MAX with BlockLimits.max_iov, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 05/10] block/mirror: replace IOV_MAX with blk_get_max_iov(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 06/10] parallels: add format spec, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.py, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 08/10] sd: sdhci: Delete over-zealous power check, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 09/10] sdhci: don't raise a command index error for an unexpected response, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 10/10] sdhci: add optional quirk property to disable card insertion/removal interrupts, Stefan Hajnoczi, 2015/12/22
- Re: [Qemu-devel] [PULL 00/10] Block patches, Peter Maydell, 2015/12/22