From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51044)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Z7oZt-00079B-F1
	for qemu-devel@nongnu.org; Wed, 24 Jun 2015 13:35:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Z7oZq-0002Uw-4W
	for qemu-devel@nongnu.org; Wed, 24 Jun 2015 13:35:13 -0400
Received: from mx1.redhat.com ([209.132.183.28]:34616)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Z7oZp-0002Uq-VK
	for qemu-devel@nongnu.org; Wed, 24 Jun 2015 13:35:10 -0400
Message-ID: <558AEA49.8050808@redhat.com>
Date: Wed, 24 Jun 2015 19:35:05 +0200
From: Max Reitz <mreitz@redhat.com>
MIME-Version: 1.0
References: <1434103761-29871-1-git-send-email-stefanha@redhat.com>
	<1434103761-29871-5-git-send-email-stefanha@redhat.com>
In-Reply-To: <1434103761-29871-5-git-send-email-stefanha@redhat.com>
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [RFC 4/9] block: keep bitmap if incremental backup
	job is cancelled
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, famz@redhat.com, Jeff Cody <jcody@redhat.com>, vsementsov@parallels.com, John Snow <jsnow@redhat.com>

On 12.06.2015 12:09, Stefan Hajnoczi wrote:
> Reclaim the dirty bitmap if an incremental backup block job is
> cancelled.  The ret variable may be 0 when the job is cancelled so it's
> not enough to check ret < 0.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/backup.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/backup.c b/block/backup.c
> index d3f648d..c1ad975 100644
> --- a/block/backup.c
> +++ b/block/backup.c
> @@ -430,7 +430,7 @@ static void coroutine_fn backup_run(void *opaque)
>   
>       if (job->sync_bitmap) {
>           BdrvDirtyBitmap *bm;
> -        if (ret < 0) {
> +        if (ret < 0 || block_job_is_cancelled(&job->common)) {
>               /* Merge the successor back into the parent, delete nothing. */
>               bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
>               assert(bm);

Since I can't find a seperate patch on qemu-devel or qemu-block yet:

Reviewed-by: Max Reitz <mreitz@redhat.com>