[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/13] migration: Expose 'cancelling' status to user
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 13/13] migration: Expose 'cancelling' status to user |
Date: |
Tue, 17 Mar 2015 16:30:35 +0100 |
From: zhanghailiang <address@hidden>
'cancelling' status was introduced by commit 51cf4c1a, mainly to avoid a
possible start of a new migration process while the previous one still exists.
But we didn't expose this status to user, instead we returned the 'active'
state.
Here, we expose it to the user (such as libvirt), 'cancelling' status only
occurs for a short window before the migration aborts, so for users,
if they cancel a migration process, it will observe 'cancelling' status
occasionally.
Testing revealed that with older libvirt (anything 1.2.13 or less) will
print an odd error message if the state is seen, but that the migration
is still properly cancelled. Newer libvirt will be patched to recognize
the new state without the odd error message.
Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Cc: address@hidden
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index d7a1e7d..bc42490 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -195,13 +195,11 @@ MigrationInfo *qmp_query_migrate(Error **errp)
break;
case MIGRATION_STATUS_SETUP:
info->has_status = true;
- info->status = MIGRATION_STATUS_SETUP;
info->has_total_time = false;
break;
case MIGRATION_STATUS_ACTIVE:
case MIGRATION_STATUS_CANCELLING:
info->has_status = true;
- info->status = MIGRATION_STATUS_ACTIVE;
info->has_total_time = true;
info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
- s->total_time;
@@ -237,7 +235,6 @@ MigrationInfo *qmp_query_migrate(Error **errp)
get_xbzrle_cache_stats(info);
info->has_status = true;
- info->status = MIGRATION_STATUS_COMPLETED;
info->has_total_time = true;
info->total_time = s->total_time;
info->has_downtime = true;
@@ -259,13 +256,12 @@ MigrationInfo *qmp_query_migrate(Error **errp)
break;
case MIGRATION_STATUS_FAILED:
info->has_status = true;
- info->status = MIGRATION_STATUS_FAILED;
break;
case MIGRATION_STATUS_CANCELLED:
info->has_status = true;
- info->status = MIGRATION_STATUS_CANCELLED;
break;
}
+ info->status = s->state;
return info;
}
--
2.1.0
- [Qemu-devel] [PULL 01/13] migration: Avoid qerror_report_err() outside QMP command handlers, (continued)
- [Qemu-devel] [PULL 01/13] migration: Avoid qerror_report_err() outside QMP command handlers, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 06/13] Warn against the use of the string as uri parameter to migrate-incoming, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 02/13] migration/rdma: clean up qemu_rdma_dest_init a bit, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 04/13] migration: Fix remaining 32 bit compiler errors, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 05/13] migrate_incoming: use hmp_handle_error, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 07/13] migrate_incoming: Cleanup/clarify error messages, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 10/13] migration: Rename abbreviated macro MIG_STATE_* to MIGRATION_STATUS_*, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 09/13] migration: Remove unused functions, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 12/13] migration: Convert 'status' of MigrationInfo to use an enum type, Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 11/13] hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus', Juan Quintela, 2015/03/17
- [Qemu-devel] [PULL 13/13] migration: Expose 'cancelling' status to user,
Juan Quintela <=
- [Qemu-devel] [PULL 08/13] arch_init: Count the total number of pages by using helper function, Juan Quintela, 2015/03/17
- Re: [Qemu-devel] [PULL 00/13] migration pull queue, Peter Maydell, 2015/03/17