From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBO5c-0005SV-P5 for qemu-devel@nongnu.org; Mon, 28 Nov 2016 10:43:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBO5c-0003a6-3y for qemu-devel@nongnu.org; Mon, 28 Nov 2016 10:43:32 -0500 Date: Mon, 28 Nov 2016 23:43:23 +0800 From: Fam Zheng Message-ID: <20161128154323.GB1232@lemon> References: <20161128085816.6161-1-w90p710@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161128085816.6161-1-w90p710@gmail.com> Subject: Re: [Qemu-devel] [PATCH] block/mirror: Fix passing wrong argument to trace_mirror_yield List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yang Wei Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org On Mon, 11/28 16:58, Yang Wei wrote: > mirror_yield is defined in block/trace-event, just like the following: > mirror_yield(void *s, int64_t cnt, int buf_free_count, int in_flight) > so we should exchange arguement 2 and 4 while invoking it. > > Signed-off-by: Yang Wei > --- > block/mirror.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/mirror.c b/block/mirror.c > index 301ba92..2846a2e 100644 > --- a/block/mirror.c > +++ b/block/mirror.c > @@ -577,7 +577,7 @@ 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, -1, s->buf_free_count, s->in_flight); > mirror_wait_for_io(s); > continue; > } > @@ -730,7 +730,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) { > -- > 2.10.2 > > Reviewed-by: Fam Zheng