From patchwork Tue Sep 20 14:19:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 115556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEC4CB6F9B for ; Wed, 21 Sep 2011 00:22:19 +1000 (EST) Received: from localhost ([::1]:43975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61D8-0000J5-VH for incoming@patchwork.ozlabs.org; Tue, 20 Sep 2011 10:22:10 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61Ba-0005Rx-7l for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R61BP-0008E5-Kv for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R61BP-0008Dw-Do for qemu-devel@nongnu.org; Tue, 20 Sep 2011 10:20:23 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8KEKMON031923 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Sep 2011 10:20:22 -0400 Received: from trasno.mitica (ovpn-113-56.phx2.redhat.com [10.3.113.56]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8KEJv9m015328; Tue, 20 Sep 2011 10:20:21 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 20 Sep 2011 16:19:47 +0200 Message-Id: <81a59db56d52b0a7814095f7b4e13b45ecfde952.1316526970.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 19/23] migration: Export a function that tells if the migration has finished correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 b8632e5..fb95e14 100644 --- a/migration.c +++ b/migration.c @@ -348,9 +348,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 6949e19..6548977 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