From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIBlN-0006hO-2G for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:31:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIBlM-00062e-5b for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:31:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIBlL-00062P-Lm for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:30:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99BC3368E5 for ; Tue, 6 Jun 2017 10:30:58 +0000 (UTC) From: Peter Xu Date: Tue, 6 Jun 2017 18:30:38 +0800 Message-Id: <1496745042-2379-3-git-send-email-peterx@redhat.com> In-Reply-To: <1496745042-2379-1-git-send-email-peterx@redhat.com> References: <1496745042-2379-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] migration: move global_state.optional out List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Laurent Vivier , Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com Put it into MigrationState then we can use the properties to specify whether to enable storing global state. Signed-off-by: Peter Xu --- include/migration/migration.h | 6 ++++++ migration/migration.c | 21 +++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index bd0186c..8aa1ea6 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -162,6 +162,12 @@ struct MigrationState /* Do we have to clean up -b/-i from old migrate parameters */ /* This feature is deprecated and will be removed */ bool must_remove_block_options; + + /* + * Global switch on whether we need to store the global state + * during migration. + */ + bool store_global_state; }; void migrate_set_state(int *state, int old_state, int new_state); diff --git a/migration/migration.c b/migration/migration.c index 483b027..0653f49 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -140,13 +140,13 @@ void migration_incoming_state_destroy(void) typedef struct { - bool optional; uint32_t size; uint8_t runstate[100]; RunState state; bool received; } GlobalState; +/* This is only used if MigrationState.store_global_state is set. */ static GlobalState global_state; int global_state_store(void) @@ -179,7 +179,7 @@ static RunState global_state_get_runstate(void) void global_state_set_optional(void) { - global_state.optional = true; + migrate_get_current()->store_global_state = false; } static bool global_state_needed(void *opaque) @@ -188,8 +188,7 @@ static bool global_state_needed(void *opaque) char *runstate = (char *)s->runstate; /* If it is not optional, it is mandatory */ - - if (s->optional == false) { + if (migrate_get_current()->store_global_state) { return true; } @@ -2109,6 +2108,19 @@ void migrate_fd_connect(MigrationState *s) s->migration_thread_running = true; } +static Property migration_properties[] = { + DEFINE_PROP_BOOL("store-global-state", MigrationState, + store_global_state, true), + DEFINE_PROP_END_OF_LIST(), +}; + +static void migration_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->props = migration_properties; +} + static void migration_instance_init(Object *obj) { MigrationState *ms = MIGRATION_OBJ(obj); @@ -2133,6 +2145,7 @@ static void migration_instance_init(Object *obj) static const TypeInfo migration_type = { .name = TYPE_MIGRATION, .parent = TYPE_DEVICE, + .class_init = migration_class_init, .class_size = sizeof(MigrationClass), .instance_size = sizeof(MigrationState), .instance_init = migration_instance_init, -- 2.7.4