diff options
| author | Jeff Cody <jcody@redhat.com> | 2015-08-14 09:41:30 -0400 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2015-08-14 09:41:30 -0400 |
| commit | d90dedfcd5b9faad105bf28b718c9477d8467e77 (patch) | |
| tree | 4eeed61720a9cc4dcd6ab72529f67e3b805f6b5b | |
| parent | be1f13ac9d9fc21908975460652a72f5f0c018c5 (diff) | |
| parent | cae98cb87d269c33d23b2bccd79bb8d99a60d811 (diff) | |
| download | qemu-d90dedfcd5b9faad105bf28b718c9477d8467e77.zip qemu-d90dedfcd5b9faad105bf28b718c9477d8467e77.tar.gz qemu-d90dedfcd5b9faad105bf28b718c9477d8467e77.tar.bz2 | |
Merge branch 'block-next' into HEAD
| -rw-r--r-- | block/mirror.c | 4 | ||||
| -rw-r--r-- | trace-events | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/block/mirror.c b/block/mirror.c index fc4d8f5..0841964 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -245,6 +245,10 @@ 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) { + trace_mirror_break_iov_max(s, nb_chunks, added_chunks); + break; + } /* We have enough free space to copy these sectors. */ bitmap_set(s->in_flight_bitmap, next_chunk, added_chunks); diff --git a/trace-events b/trace-events index 94bf3bb..8f9614a 100644 --- a/trace-events +++ b/trace-events @@ -94,6 +94,7 @@ mirror_yield(void *s, int64_t cnt, int buf_free_count, int in_flight) "s %p dirt mirror_yield_in_flight(void *s, int64_t sector_num, int in_flight) "s %p sector_num %"PRId64" in_flight %d" mirror_yield_buf_busy(void *s, int nb_chunks, int in_flight) "s %p requested chunks %d in_flight %d" mirror_break_buf_busy(void *s, int nb_chunks, int in_flight) "s %p requested chunks %d in_flight %d" +mirror_break_iov_max(void *s, int nb_chunks, int added_chunks) "s %p requested chunks %d added_chunks %d" # block/backup.c backup_do_cow_enter(void *job, int64_t start, int64_t sector_num, int nb_sectors) "job %p start %"PRId64" sector_num %"PRId64" nb_sectors %d" |