From: Fam Zheng <famz@redhat.com>
To: John Snow <jsnow@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Jeff Cody <jcody@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
vsementsov@parallels.com, stefanha@redhat.com
Subject: Re: [Qemu-devel] [PATCH v3 05/15] backup: Extract dirty bitmap handling as a separate function
Date: Tue, 14 Jul 2015 10:46:05 +0800 [thread overview]
Message-ID: <20150714024605.GD24118@ad.nay.redhat.com> (raw)
In-Reply-To: <55A4446A.7010407@redhat.com>
On Mon, 07/13 19:06, John Snow wrote:
>
>
> On 07/09/2015 11:46 PM, Fam Zheng wrote:
> > This will be reused by the coming new transactional completion code.
> >
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> > block/backup.c | 26 ++++++++++++++++----------
> > 1 file changed, 16 insertions(+), 10 deletions(-)
> >
> > diff --git a/block/backup.c b/block/backup.c
> > index 965654d..6e24384 100644
> > --- a/block/backup.c
> > +++ b/block/backup.c
> > @@ -210,6 +210,21 @@ static void backup_iostatus_reset(BlockJob *job)
> >
> > bdrv_iostatus_reset(s->target);
> > }
> > +static void backup_handle_dirty_bitmap(BackupBlockJob *job, int ret)
> > +{
> > + BdrvDirtyBitmap *bm;
> > + BlockDriverState *bs = job->common.bs;
> > +
> > + 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);
> > + } else {
> > + /* Everything is fine, delete this bitmap and install the backup. */
> > + bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
> > + assert(bm);
> > + }
> > +}
> >
> > static const BlockJobDriver backup_job_driver = {
> > .instance_size = sizeof(BackupBlockJob),
> > @@ -430,16 +445,7 @@ static void coroutine_fn backup_run(void *opaque)
> > qemu_co_rwlock_unlock(&job->flush_rwlock);
> >
> > if (job->sync_bitmap) {
> > - BdrvDirtyBitmap *bm;
> > - 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);
> > - } else {
> > - /* Everything is fine, delete this bitmap and install the backup. */
> > - bm = bdrv_dirty_bitmap_abdicate(bs, job->sync_bitmap, NULL);
> > - assert(bm);
> > - }
> > + backup_handle_dirty_bitmap(job, ret);
> > }
> > hbitmap_free(job->bitmap);
> >
> >
>
> Bike-shedding: strange name, I may have used 'cleanup' or 'finalize' or
> so, but that's neither here nor there.
Good suggestion, so I'll change to "cleanup" while keeping your reviewed-by,
ok? :)
Fam
>
> Reviewed-by: John Snow <jsnow@redhat.com>
>
next prev parent reply other threads:[~2015-07-14 2:46 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 3:46 [Qemu-devel] [PATCH v3 00/15] block: incremental backup transactions using BlockJobTxn Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 01/15] qapi: Add transaction support to block-dirty-bitmap operations Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 02/15] iotests: add transactional incremental backup test Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 03/15] block: rename BlkTransactionState and BdrvActionOps Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 04/15] block: keep bitmap if incremental backup job is cancelled Fam Zheng
2015-07-13 19:48 ` John Snow
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 05/15] backup: Extract dirty bitmap handling as a separate function Fam Zheng
2015-07-13 23:06 ` John Snow
2015-07-14 2:46 ` Fam Zheng [this message]
2015-07-14 8:26 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 06/15] blockjob: Add .txn_commit and .txn_abort transaction actions Fam Zheng
2015-07-13 23:06 ` John Snow
2015-07-14 8:35 ` Stefan Hajnoczi
2015-07-14 9:26 ` Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 07/15] blockjob: Add "completed" and "ret" in BlockJob Fam Zheng
2015-07-13 23:08 ` John Snow
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync Fam Zheng
2015-07-13 23:08 ` John Snow
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 09/15] blockjob: Move BlockJobDeferToMainLoopData into BlockJob Fam Zheng
2015-07-14 10:03 ` Stefan Hajnoczi
2015-07-14 10:36 ` Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 10/15] block: add block job transactions Fam Zheng
2015-07-13 23:12 ` John Snow
2015-07-14 3:04 ` Fam Zheng
2015-07-14 15:05 ` John Snow
2015-07-14 10:27 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 11/15] blockdev: make BlockJobTxn available to qmp 'transaction' Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 12/15] block/backup: support block job transactions Fam Zheng
2015-07-13 23:14 ` John Snow
2015-07-14 3:12 ` Fam Zheng
2015-07-14 10:32 ` Stefan Hajnoczi
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 13/15] iotests: 124 - transactional failure test Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 14/15] qmp-commands.hx: Update the supported 'transaction' operations Fam Zheng
2015-07-10 3:46 ` [Qemu-devel] [PATCH v3 15/15] tests: add BlockJobTxn unit test Fam Zheng
2015-07-13 23:14 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150714024605.GD24118@ad.nay.redhat.com \
--to=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.