From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRrLW-00071q-Jv for qemu-devel@nongnu.org; Sun, 02 Jul 2017 22:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRrLT-0006mG-AR for qemu-devel@nongnu.org; Sun, 02 Jul 2017 22:44:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41534) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dRrLT-0006lr-5P for qemu-devel@nongnu.org; Sun, 02 Jul 2017 22:44:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3754E83F3D for ; Mon, 3 Jul 2017 02:44:14 +0000 (UTC) From: Peter Xu Date: Mon, 3 Jul 2017 10:44:05 +0800 Message-Id: <1499049848-18012-2-git-send-email-peterx@redhat.com> In-Reply-To: <1499049848-18012-1-git-send-email-peterx@redhat.com> References: <1499049848-18012-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] migration: fix handling for --only-migratable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com MigrateState object is not ready at that time, so we'll get an assertion. Use qemu_global_option() instead. Reported-by: Eduardo Habkost Suggested-by: Eduardo Habkost Fixes: 3df663e ("migration: move only_migratable to MigrationState") Signed-off-by: Peter Xu --- include/migration/misc.h | 1 - migration/migration.c | 5 ----- vl.c | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/migration/misc.h b/include/migration/misc.h index 2255121..c079b77 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -53,7 +53,6 @@ bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); /* ...and after the device transmission */ bool migration_in_postcopy_after_devices(MigrationState *); -void migration_only_migratable_set(void); void migration_global_dump(Monitor *mon); #endif diff --git a/migration/migration.c b/migration/migration.c index 51ccd1a..dbdc121 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -128,11 +128,6 @@ MigrationState *migrate_get_current(void) return current_migration; } -void migration_only_migratable_set(void) -{ - migrate_get_current()->only_migratable = true; -} - MigrationIncomingState *migration_incoming_get_current(void) { static bool once; diff --git a/vl.c b/vl.c index 36ff3f4..0c497a3 100644 --- a/vl.c +++ b/vl.c @@ -3958,7 +3958,7 @@ int main(int argc, char **argv, char **envp) * * "-global migration.only-migratable=true" */ - migration_only_migratable_set(); + qemu_global_option("migration.only-migratable=true"); break; case QEMU_OPTION_nodefaults: has_defaults = 0; -- 2.7.4