From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWNA3-0001uz-Gp for qemu-devel@nongnu.org; Fri, 13 Mar 2015 06:49:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YWN9y-0002XL-IQ for qemu-devel@nongnu.org; Fri, 13 Mar 2015 06:49:47 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:40477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWN9y-0002XH-Bz for qemu-devel@nongnu.org; Fri, 13 Mar 2015 06:49:42 -0400 Received: by wghk14 with SMTP id k14so22318971wgh.7 for ; Fri, 13 Mar 2015 03:49:41 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <5502C0C1.60903@redhat.com> Date: Fri, 13 Mar 2015 11:49:37 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1425883543-8852-1-git-send-email-zhang.zhanghailiang@huawei.com> <1425883543-8852-5-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1425883543-8852-5-git-send-email-zhang.zhanghailiang@huawei.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 4/4] migration: Expose 'cancelling' status to user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang , qemu-devel@nongnu.org Cc: quintela@redhat.com, libvir-list@redhat.com, armbru@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, amit.shah@redhat.com, dgilbert@redhat.com On 09/03/2015 07:45, zhanghailiang wrote: > '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 > Reviewed-by: Eric Blake > Cc: libvir-list@redhat.com Why is this necessary? Paolo > --- > migration/migration.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 035e005..a57928d 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -179,13 +179,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; > @@ -221,7 +219,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; > @@ -243,13 +240,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; > } >