From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R75KB-000105-Mp for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:57:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R75KA-0004pi-RD for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:57:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R75KA-0004pe-JE for qemu-devel@nongnu.org; Fri, 23 Sep 2011 08:57:50 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8NCvnoO016031 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 23 Sep 2011 08:57:49 -0400 From: Juan Quintela Date: Fri, 23 Sep 2011 14:56:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 08/23] migration: Introduce MIG_STATE_NONE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Use MIG_STATE_ACTIVE only when migration has really started Signed-off-by: Juan Quintela --- migration.c | 6 +++++- migration.h | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index 88f4c23..abb99ea 100644 --- a/migration.c +++ b/migration.c @@ -240,6 +240,9 @@ void do_info_migrate(Monitor *mon, QObject **ret_data) MigrationState *s = current_migration; switch (s->get_status(current_migration)) { + case MIG_STATE_NONE: + /* no migration has happened ever */ + break; case MIG_STATE_ACTIVE: qdict = qdict_new(); qdict_put(qdict, "status", qstring_from_str("active")); @@ -479,6 +482,7 @@ void migrate_fd_connect(MigrationState *s) { int ret; + s->state = MIG_STATE_ACTIVE; s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit, migrate_fd_put_buffer, @@ -509,7 +513,7 @@ static MigrationState *migrate_create_state(Monitor *mon, s->shared = inc; s->mon = NULL; s->bandwidth_limit = bandwidth_limit; - s->state = MIG_STATE_ACTIVE; + s->state = MIG_STATE_NONE; if (!detach) { migrate_fd_monitor_suspend(s, mon); diff --git a/migration.h b/migration.h index 14c3ebc..8792655 100644 --- a/migration.h +++ b/migration.h @@ -18,10 +18,13 @@ #include "qemu-common.h" #include "notify.h" -#define MIG_STATE_ERROR -1 -#define MIG_STATE_COMPLETED 0 -#define MIG_STATE_CANCELLED 1 -#define MIG_STATE_ACTIVE 2 +enum migration_state { + MIG_STATE_ERROR, + MIG_STATE_NONE, + MIG_STATE_CANCELLED, + MIG_STATE_ACTIVE, + MIG_STATE_COMPLETED, +}; typedef struct MigrationState MigrationState; -- 1.7.6.2