qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>,
	Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
	"open list:Block I/O path" <qemu-block@nongnu.org>,
	Juan Quintela <quintela@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>,
	John Snow <jsnow@redhat.com>
Subject: [PULL 10/24] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
Date: Mon, 27 Jul 2020 15:55:29 -0500	[thread overview]
Message-ID: <20200727205543.206624-11-eblake@redhat.com> (raw)
In-Reply-To: <20200727205543.206624-1-eblake@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
stress that it is on save part.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200727194236.19551-10-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 migration/block-dirty-bitmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 1d57bff4f6c7..01a536d7d3d3 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -259,7 +259,7 @@ static void send_bitmap_bits(QEMUFile *f, SaveBitmapState *dbms,
 }

 /* Called with iothread lock taken.  */
-static void dirty_bitmap_mig_cleanup(void)
+static void dirty_bitmap_do_save_cleanup(void)
 {
     SaveBitmapState *dbms;

@@ -406,7 +406,7 @@ static int init_dirty_bitmap_migration(void)

 fail:
     g_hash_table_destroy(handled_by_blk);
-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();

     return -1;
 }
@@ -445,7 +445,7 @@ static void bulk_phase(QEMUFile *f, bool limit)
 /* for SaveVMHandlers */
 static void dirty_bitmap_save_cleanup(void *opaque)
 {
-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();
 }

 static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque)
@@ -480,7 +480,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)

     trace_dirty_bitmap_save_complete_finish();

-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();
     return 0;
 }

-- 
2.27.0



  parent reply	other threads:[~2020-07-27 20:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27 20:55 [PULL 00/24] bitmaps patches for -rc2, 2020-07-27 Eric Blake
2020-07-27 20:55 ` [PULL 01/24] qcow2: Fix capitalization of header extension constant Eric Blake
2020-07-27 20:55 ` [PULL 02/24] qemu-iotests/199: fix style Eric Blake
2020-07-27 20:55 ` [PULL 03/24] qemu-iotests/199: drop extra constraints Eric Blake
2020-07-27 20:55 ` [PULL 04/24] qemu-iotests/199: better catch postcopy time Eric Blake
2020-07-27 20:55 ` [PULL 05/24] qemu-iotests/199: improve performance: set bitmap by discard Eric Blake
2020-07-27 20:55 ` [PULL 06/24] qemu-iotests/199: change discard patterns Eric Blake
2020-07-27 20:55 ` [PULL 07/24] qemu-iotests/199: increase postcopy period Eric Blake
2020-07-27 20:55 ` [PULL 08/24] migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start Eric Blake
2020-07-27 20:55 ` [PULL 09/24] migration/block-dirty-bitmap: rename state structure types Eric Blake
2020-07-27 20:55 ` Eric Blake [this message]
2020-07-27 20:55 ` [PULL 11/24] migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init Eric Blake
2020-07-27 20:55 ` [PULL 12/24] migration/block-dirty-bitmap: refactor state global variables Eric Blake
2020-07-27 20:55 ` [PULL 13/24] migration/block-dirty-bitmap: rename finish_lock to just lock Eric Blake
2020-07-27 20:55 ` [PULL 14/24] migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete Eric Blake
2020-07-27 20:55 ` [PULL 15/24] migration/block-dirty-bitmap: keep bitmap state for all bitmaps Eric Blake
2020-07-27 20:55 ` [PULL 16/24] migration/block-dirty-bitmap: relax error handling in incoming part Eric Blake
2020-07-27 20:55 ` [PULL 17/24] migration/block-dirty-bitmap: cancel migration on shutdown Eric Blake
2020-07-27 20:55 ` [PULL 18/24] migration/savevm: don't worry if bitmap migration postcopy failed Eric Blake
2020-07-27 20:55 ` [PULL 19/24] qemu-iotests/199: prepare for new test-cases addition Eric Blake
2020-07-27 20:55 ` [PULL 20/24] qemu-iotests/199: check persistent bitmaps Eric Blake
2020-07-27 20:55 ` [PULL 21/24] qemu-iotests/199: add early shutdown case to bitmaps postcopy Eric Blake
2020-07-27 20:55 ` [PULL 22/24] qemu-iotests/199: add source-killed " Eric Blake
2020-07-27 20:55 ` [PULL 23/24] iotests: Adjust which migration tests are quick Eric Blake
2020-07-27 20:55 ` [PULL 24/24] migration: Fix typos in bitmap migration comments Eric Blake
2020-07-28 14:24 ` [PULL 00/24] bitmaps patches for -rc2, 2020-07-27 Peter Maydell

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=20200727205543.206624-11-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=andrey.shinkevich@virtuozzo.com \
    --cc=dgilbert@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@virtuozzo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).