From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWbnc-0003DG-B7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWbnb-00016W-BM for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39934) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eWbnb-000163-53 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 00:41:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48D5681DF3 for ; Wed, 3 Jan 2018 05:41:10 +0000 (UTC) From: Peter Xu Date: Wed, 3 Jan 2018 13:40:40 +0800 Message-Id: <20180103054043.25719-9-peterx@redhat.com> In-Reply-To: <20180103054043.25719-1-peterx@redhat.com> References: <20180103054043.25719-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] migration: use switch at the end of migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com It converts the old if clauses into switch, explicitly mentions the possible migration states. The old nested "if"s are not clear on what we do on different states. Signed-off-by: Peter Xu --- migration/migration.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index acef54748b..bfcba24caa 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2296,19 +2296,23 @@ static void *migration_thread(void *opaque) cpu_throttle_stop(); qemu_mutex_lock_iothread(); - if (s->state == MIGRATION_STATUS_COMPLETED) { + switch (s->state) { + case MIGRATION_STATUS_COMPLETED: migration_calculate_complete(s); runstate_set(RUN_STATE_POSTMIGRATE); - } else { - if (s->state == MIGRATION_STATUS_ACTIVE) { - assert(migrate_colo_enabled()); - migrate_start_colo_process(s); - /* - * Fixme: we will run VM in COLO no matter its old running state. - * After exited COLO, we will keep running. - */ - s->old_vm_running = true; - } + break; + + case MIGRATION_STATUS_ACTIVE: + assert(migrate_colo_enabled()); + migrate_start_colo_process(s); + /* + * Fixme: we will run VM in COLO no matter its old running state. + * After exited COLO, we will keep running. + */ + s->old_vm_running = true; + /* Fallthrough */ + case MIGRATION_STATUS_FAILED: + case MIGRATION_STATUS_CANCELLED: if (s->old_vm_running) { vm_start(); } else { @@ -2316,6 +2320,12 @@ static void *migration_thread(void *opaque) runstate_set(RUN_STATE_POSTMIGRATE); } } + break; + + default: + /* Should not reach here, but if so, forgive the VM. */ + error_report("%s: Unknown ending state %d", __func__, s->state); + break; } qemu_bh_schedule(s->cleanup_bh); qemu_mutex_unlock_iothread(); -- 2.14.3