From 24b8c39b5c34b05f1ac870c421e2e61574abbdf9 Mon Sep 17 00:00:00 2001 From: zhanghailiang Date: Fri, 13 Mar 2015 16:08:40 +0800 Subject: migration: Convert 'status' of MigrationInfo to use an enum type The original 'status' is an open-coded 'str' type, convert it to use an enum type. This conversion is backwards compatible, better documented and more convenient for future extensibility. In addition, Fix a typo for qapi-schema.json (just remove the typo) : s/'completed'. 'comppleted' (since 1.2)/'completed' (since 1.2) Signed-off-by: zhanghailiang Reviewed-by: Eric Blake Signed-off-by: Juan Quintela --- hmp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'hmp.c') diff --git a/hmp.c b/hmp.c index 8afce2d6d9..7d5c81ed07 100644 --- a/hmp.c +++ b/hmp.c @@ -162,7 +162,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) } if (info->has_status) { - monitor_printf(mon, "Migration status: %s\n", info->status); + monitor_printf(mon, "Migration status: %s\n", + MigrationStatus_lookup[info->status]); monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n", info->total_time); if (info->has_expected_downtime) { @@ -1354,8 +1355,8 @@ static void hmp_migrate_status_cb(void *opaque) MigrationInfo *info; info = qmp_query_migrate(NULL); - if (!info->has_status || strcmp(info->status, "active") == 0 || - strcmp(info->status, "setup") == 0) { + if (!info->has_status || info->status == MIGRATION_STATUS_ACTIVE || + info->status == MIGRATION_STATUS_SETUP) { if (info->has_disk) { int progress; -- cgit 1.4.1