From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsOZa-0003ov-1U for qemu-devel@nongnu.org; Wed, 04 Jun 2014 23:42:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsOZT-000205-Sv for qemu-devel@nongnu.org; Wed, 04 Jun 2014 23:42:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsOZT-000201-J5 for qemu-devel@nongnu.org; Wed, 04 Jun 2014 23:42:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s553gUZ1028474 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Jun 2014 23:42:30 -0400 From: Fam Zheng Date: Thu, 5 Jun 2014 11:42:34 +0800 Message-Id: <1401939756-11150-2-git-send-email-famz@redhat.com> In-Reply-To: <1401939756-11150-1-git-send-email-famz@redhat.com> References: <1401939756-11150-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] mirror: Go through ready -> complete process for 0 len image List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , jcody@redhat.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini When mirroring or active committing a zero length image, BLOCK_JOB_READY is not reported now, instead the job completes because we short circuit the mirror job loop. This is inconsistent with non-zero length images, and only confuses management software. Let's do the same thing when seeing a 0-length image: report ready immediately; wait for block-job-cancel or block-job-complete; clear the cancel flag as existing non-zero image synced case (cancelled after ready); then jump to the exit. Reported-by: Eric Blake Signed-off-by: Fam Zheng --- block/mirror.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 94c8661..2bef5f3 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -324,9 +324,18 @@ static void coroutine_fn mirror_run(void *opaque) } s->common.len = bdrv_getlength(bs); - if (s->common.len <= 0) { + if (s->common.len < 0) { ret = s->common.len; goto immediate_exit; + } else if (s->common.len == 0) { + /* Report BLOCK_JOB_READY and wait for complete. */ + block_job_ready(&s->common); + s->synced = true; + while (!block_job_is_cancelled(&s->common) && !s->should_complete) { + block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, SLICE_TIME); + } + s->common.cancelled = false; + goto immediate_exit; } length = DIV_ROUND_UP(s->common.len, s->granularity); -- 2.0.0