From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45635)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1Z8A5s-0004Mz-EY
	for qemu-devel@nongnu.org; Thu, 25 Jun 2015 12:33:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1Z8A5m-0004md-SP
	for qemu-devel@nongnu.org; Thu, 25 Jun 2015 12:33:40 -0400
Date: Thu, 25 Jun 2015 12:33:25 -0400
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20150625163325.GC13877@localhost.localdomain>
References: <1435236788-9176-1-git-send-email-stefanha@redhat.com>
	<558C2CC0.8040309@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <558C2CC0.8040309@redhat.com>
Subject: Re: [Qemu-devel] [PATCH for-2.4] 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: John Snow <jsnow@redhat.com>
Cc: mreitz@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, qemu-stable@nongnu.org

On Thu, Jun 25, 2015 at 12:30:56PM -0400, John Snow wrote:
> 
> 
> On 06/25/2015 08:53 AM, 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 <jsnow@redhat.com>
> > Reviewed-by: Max Reitz <mreitz@redhat.com>
> > 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 4a1af68..ddf8424 100644
> > --- a/block/backup.c
> > +++ b/block/backup.c
> > @@ -431,7 +431,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);
> > 
> 
> Didn't Jeff Cody already stage this?

Yes