[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC 4/9] block: keep bitmap if incremental backup job
From: |
Stefan Hajnoczi |
Subject: |
Re: [Qemu-devel] [RFC 4/9] block: keep bitmap if incremental backup job is cancelled |
Date: |
Mon, 15 Jun 2015 15:48:29 +0100 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Fri, Jun 12, 2015 at 06:39:19PM -0400, John Snow wrote:
>
>
> On 06/12/2015 06:09 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.
> >
> > Signed-off-by: Stefan Hajnoczi <address@hidden>
> > ---
> > 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);
> >
>
> Reviewed-by: John Snow <address@hidden>
Thanks, I'll send this patch separately and CC qemu-stable.
pgpBQyS45M7yl.pgp
Description: PGP signature
- [Qemu-devel] [RFC 0/9] block: incremental backup transactions using BlockJobTxn, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 1/9] qapi: Add transaction support to block-dirty-bitmap operations, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 2/9] iotests: add transactional incremental backup test, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 3/9] block: rename BlkTransactionState and BdrvActionOps, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 4/9] block: keep bitmap if incremental backup job is cancelled, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 5/9] block: add block job transactions, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 6/9] blockdev: make BlockJobTxn available to qmp 'transaction', Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 7/9] block/backup: support block job transactions, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 8/9] iotests: 124 - transactional failure test, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [RFC 9/9] qmp-commands.hx: Update the supported 'transaction' operations, Stefan Hajnoczi, 2015/06/12