From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB61d-0003nc-RM for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:31:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB61c-0008CJ-Md for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:31:17 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:41128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB61c-0008CE-Jb for qemu-devel@nongnu.org; Tue, 04 Oct 2011 10:31:16 -0400 Received: by iagf6 with SMTP id f6so768098iag.4 for ; Tue, 04 Oct 2011 07:31:16 -0700 (PDT) Message-ID: <4E8B18AE.8050804@codemonkey.ws> Date: Tue, 04 Oct 2011 09:31:10 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <808d7f54a5742f34d467a6293f6fff8fefbc6d15.1316782367.git.quintela@redhat.com> In-Reply-To: <808d7f54a5742f34d467a6293f6fff8fefbc6d15.1316782367.git.quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 19/23] migration: Export a function that tells if the migration has finished correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 09/23/2011 07:57 AM, Juan Quintela wrote: > This will allows us to hide the status values. > > Signed-off-by: Juan Quintela > --- > migration.c | 4 ++-- > migration.h | 2 +- > ui/spice-core.c | 4 +--- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/migration.c b/migration.c > index ea50a6f..580f546 100644 > --- a/migration.c > +++ b/migration.c > @@ -358,9 +358,9 @@ void remove_migration_state_change_notifier(Notifier *notify) > notifier_list_remove(&migration_state_notifiers, notify); > } > > -int get_migration_state(void) > +bool migration_has_finished(void) > { > - return current_migration->state; > + return current_migration->state == MIG_STATE_COMPLETED; > } > > void migrate_fd_connect(MigrationState *s) > diff --git a/migration.h b/migration.h > index f1a7452..6641a26 100644 > --- a/migration.h > +++ b/migration.h > @@ -84,7 +84,7 @@ void migrate_fd_connect(MigrationState *s); > > void add_migration_state_change_notifier(Notifier *notify); > void remove_migration_state_change_notifier(Notifier *notify); > -int get_migration_state(void); > +bool migration_has_finished(void); > > uint64_t ram_bytes_remaining(void); > uint64_t ram_bytes_transferred(void); > diff --git a/ui/spice-core.c b/ui/spice-core.c > index 3cbc721..1202993 100644 > --- a/ui/spice-core.c > +++ b/ui/spice-core.c > @@ -447,9 +447,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data) > > static void migration_state_notifier(Notifier *notifier, void *data) > { > - int state = get_migration_state(); > - > - if (state == MIG_STATE_COMPLETED) { > + if (migration_has_finished()) { > #if SPICE_SERVER_VERSION>= 0x000701 /* 0.7.1 */ > spice_server_migrate_switch(spice_server); > #endif I think the bug here is migration_state_notifier. It should take an additional argument of MigrationState. Otherwise, how does this code work with FT? Regards, Anthony Liguori