qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	peterx@redhat.com
Subject: [Qemu-devel] [PATCH 03/11] migration: remove "enable_colo" var
Date: Wed,  3 Jan 2018 13:40:35 +0800	[thread overview]
Message-ID: <20180103054043.25719-4-peterx@redhat.com> (raw)
In-Reply-To: <20180103054043.25719-1-peterx@redhat.com>

It's only used once, clean it up a bit.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index edbda43246..20f7565527 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2177,7 +2177,6 @@ static void *migration_thread(void *opaque)
     bool entered_postcopy = false;
     /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */
     enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE;
-    bool enable_colo = migrate_colo_enabled();
 
     rcu_register_thread();
 
@@ -2305,7 +2304,7 @@ static void *migration_thread(void *opaque)
         runstate_set(RUN_STATE_POSTMIGRATE);
     } else {
         if (s->state == MIGRATION_STATUS_ACTIVE) {
-            assert(enable_colo);
+            assert(migrate_colo_enabled());
             migrate_start_colo_process(s);
             /*
             * Fixme: we will run VM in COLO no matter its old running state.
-- 
2.14.3

  parent reply	other threads:[~2018-01-03  5:40 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-03  5:40 [Qemu-devel] [PATCH 00/11] migration: cleanup migration_thread() Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 01/11] migration: assert colo instead of check Peter Xu
2018-01-03  8:38   ` Juan Quintela
2018-01-03  8:58     ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 02/11] migration: qemu_savevm_state_cleanup() in cleanup Peter Xu
2018-01-03  9:15   ` Juan Quintela
2018-01-03  9:36     ` Peter Xu
2018-01-03 10:21       ` Juan Quintela
2018-01-03 10:26         ` Peter Xu
2018-01-03 11:18           ` Juan Quintela
2018-01-03 11:39             ` Peter Xu
2018-01-03  5:40 ` Peter Xu [this message]
2018-01-03  8:55   ` [Qemu-devel] [PATCH 03/11] migration: remove "enable_colo" var Juan Quintela
2018-01-03  5:40 ` [Qemu-devel] [PATCH 04/11] migration: split use of MigrationState.total_time Peter Xu
2018-01-03  8:58   ` Juan Quintela
2018-01-03  9:04     ` Peter Xu
2018-01-03  9:20       ` Juan Quintela
2018-01-03  9:29         ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 05/11] migration: move vm_old_running into global state Peter Xu
2018-01-03  9:05   ` Juan Quintela
2018-01-03  9:20     ` Peter Xu
2018-01-03 10:26       ` Juan Quintela
2018-01-03 10:40         ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 06/11] migration: introduce vm_down_start_time Peter Xu
2018-01-03  9:10   ` Juan Quintela
2018-01-03  9:40     ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 07/11] migration: introduce migrate_calculate_complete Peter Xu
2018-01-03  9:12   ` Juan Quintela
2018-01-03 10:52     ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 08/11] migration: use switch at the end of migration Peter Xu
2018-01-03  9:14   ` Juan Quintela
2018-01-03  5:40 ` [Qemu-devel] [PATCH 09/11] migration: cleanup stats update into function Peter Xu
2018-01-03 10:08   ` Juan Quintela
2018-01-03 10:55     ` Peter Xu
2018-01-03 10:58       ` Peter Xu
2018-01-03  5:40 ` [Qemu-devel] [PATCH 10/11] migration: major cleanup for migrate iterations Peter Xu
2018-01-03 10:19   ` Juan Quintela
2018-01-03  5:40 ` [Qemu-devel] [PATCH 11/11] migration: put the finish part into a new function Peter Xu
2018-01-03 10:20   ` Juan Quintela

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=20180103054043.25719-4-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.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).