Commit 67adf4b3 authored by Eric Blake's avatar Eric Blake Committed by Stefan Hajnoczi
Browse files

trace: Fix backwards mirror_yield parameters 



block/trace-events lists the parameters for mirror_yield
consistently with other mirror events (cnt just after s, like in
mirror_before_sleep; in_flight last, like in mirror_yield_in_flight).
But the callers were passing parameters in the wrong order, leading
to poor trace messages, including type truncation when there are
more than 4G dirty sectors involved.  Broken since its introduction
in commit bd48bde8.

While touching this, ensure that all callers use the same type
(uint64_t) for cnt, as a later patch will enable the compiler to do
stricter type-checking.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 08329701

block/mirror.c

+3 −2
Original line number Diff line number Diff line
@@ -634,7 +634,8 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 
            }



            if (s->in_flight >= MAX_IN_FLIGHT) {

                trace_mirror_yield(s, s->in_flight, s->buf_free_count, -1);

                trace_mirror_yield(s, UINT64_MAX, s->buf_free_count,

                                   s->in_flight);

                mirror_wait_for_io(s);

                continue;

            }
@@ -809,7 +810,7 @@ static void coroutine_fn mirror_run(void *opaque) 
            s->common.iostatus == BLOCK_DEVICE_IO_STATUS_OK) {

            if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 ||

                (cnt == 0 && s->in_flight > 0)) {

                trace_mirror_yield(s, s->in_flight, s->buf_free_count, cnt);

                trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight);

                mirror_wait_for_io(s);

                continue;

            } else if (cnt != 0) {