From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4iBU-0002QN-7r for qemu-devel@nongnu.org; Tue, 16 Jun 2015 00:09:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4iBQ-0004va-VO for qemu-devel@nongnu.org; Tue, 16 Jun 2015 00:09:12 -0400 Date: Tue, 16 Jun 2015 00:09:06 -0400 From: Jeff Cody Message-ID: <20150616040906.GC31232@localhost.localdomain> References: <1434380534-7680-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1434380534-7680-1-git-send-email-stefanha@redhat.com> Subject: Re: [Qemu-devel] [PATCH] block: keep bitmap if incremental backup job is cancelled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org, qemu-stable@nongnu.org On Mon, Jun 15, 2015 at 04:02:14PM +0100, 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. > > Reviewed-by: John Snow > Signed-off-by: Stefan Hajnoczi > --- > 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); > -- > 2.4.3 > Thanks, applied to my block tree: https://github.com/codyprime/qemu-kvm-jtc/commits/block Jeff