From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCSHd-0000p2-BM for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCSHc-0000Nr-CC for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:47:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCSHc-0000Nm-7b for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:47:32 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 70C6E2635 for ; Tue, 7 Jul 2015 12:47:31 +0000 (UTC) From: Juan Quintela Date: Tue, 7 Jul 2015 14:47:29 +0200 Message-Id: <1436273249-20966-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH] migration: Make events a capability List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com Make check fails with events. THis is due to the parser/lexer that it uses. Just in case that they are more broken parsers, just only send events when there are capabilities. Signed-off-by: Juan Quintela --- include/migration/migration.h | 1 + migration/migration.c | 20 ++++++++++++++++++-- qapi-schema.json | 5 ++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index a308ecc..b2711ef 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -177,6 +177,7 @@ bool migrate_use_compression(void); int migrate_compress_level(void); int migrate_compress_threads(void); int migrate_decompress_threads(void); +bool migrate_use_events(void); void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); diff --git a/migration/migration.c b/migration/migration.c index d00a33b..45719a0 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -205,6 +205,14 @@ void register_global_state(void) vmstate_register(NULL, 0, &vmstate_globalstate, &global_state); } +static void migrate_generate_event(int new_state) +{ + if (migrate_use_events()) { + qapi_event_send_migration(new_state, &error_abort); + trace_migrate_set_state(new_state); + } +} + /* * Called on -incoming with a defer: uri. * The migration can be started later after any parameters have been @@ -514,8 +522,7 @@ void qmp_migrate_set_parameters(bool has_compress_level, static void migrate_set_state(MigrationState *s, int old_state, int new_state) { if (atomic_cmpxchg(&s->state, old_state, new_state) == old_state) { - qapi_event_send_migration(new_state, &error_abort); - trace_migrate_set_state(new_state); + migrate_generate_event(new_state); } } @@ -865,6 +872,15 @@ int migrate_decompress_threads(void) return s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS]; } +bool migrate_use_events(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS]; +} + int migrate_use_xbzrle(void) { MigrationState *s; diff --git a/qapi-schema.json b/qapi-schema.json index 106008c..1285b8c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -523,6 +523,9 @@ # minimize migration traffic. The feature is disabled by default. # (since 2.4 ) # +# @events: generate events for each migration state change +# (since 2.4 ) +# # @auto-converge: If enabled, QEMU will automatically throttle down the guest # to speed up convergence of RAM migration. (since 1.6) # @@ -530,7 +533,7 @@ ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress'] } + 'compress', 'events'] } ## # @MigrationCapabilityStatus -- 2.4.3