diff options
| author | zhanghailiang <zhang.zhanghailiang@huawei.com> | 2015-03-13 16:08:40 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-03-17 15:20:37 +0100 |
| commit | 24b8c39b5c34b05f1ac870c421e2e61574abbdf9 (patch) | |
| tree | 80891c0d0feae3ed25d4acbdc7d8bc04ef32171d /hmp.c | |
| parent | e49f35bdb4974d6cfd7e5eb5cb9f8c50eef3f3a9 (diff) | |
| download | qemu-24b8c39b5c34b05f1ac870c421e2e61574abbdf9.zip | |
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 <zhang.zhanghailiang@huawei.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'hmp.c')
| -rw-r--r-- | hmp.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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; |