From patchwork Tue Oct 11 10:00:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 118949 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 4ED06B6F71 for ; Tue, 11 Oct 2011 22:37:47 +1100 (EST) Received: from localhost ([::1]:45831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDaeV-0003Zp-2n for incoming@patchwork.ozlabs.org; Tue, 11 Oct 2011 07:37:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZDN-0006vH-K5 for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:05:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDZDE-0000t5-56 for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:05:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDZDD-0000sv-Sv for qemu-devel@nongnu.org; Tue, 11 Oct 2011 06:05:28 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9BA5R7S019017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Oct 2011 06:05:27 -0400 Received: from neno.neno (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9BA1lwF021320; Tue, 11 Oct 2011 06:05:23 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 11 Oct 2011 12:00:52 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 32/36] 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 allow us to hide the state values. Signed-off-by: Juan Quintela --- migration.c | 4 ++-- migration.h | 2 +- ui/spice-core.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index 6129cb5..c4e2ba6 100644 --- a/migration.c +++ b/migration.c @@ -364,9 +364,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(MigrationState *s) { - return migrate_get_current()->state; + return s->state == MIG_STATE_COMPLETED; } void migrate_fd_connect(MigrationState *s) diff --git a/migration.h b/migration.h index f059183..7ae127f 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(MigrationState *); 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..b33366e 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -447,9 +447,9 @@ void do_info_spice(Monitor *mon, QObject **ret_data) static void migration_state_notifier(Notifier *notifier, void *data) { - int state = get_migration_state(); + MigrationState *s = data; - if (state == MIG_STATE_COMPLETED) { + if (migration_has_finished(s)) { #if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */ spice_server_migrate_switch(spice_server); #endif