From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDpJu-00078x-7a for qemu-devel@nongnu.org; Wed, 02 May 2018 06:49:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDpJt-0003As-CG for qemu-devel@nongnu.org; Wed, 02 May 2018 06:49:10 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42042 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fDpJt-0003AX-7I for qemu-devel@nongnu.org; Wed, 02 May 2018 06:49:09 -0400 From: Peter Xu Date: Wed, 2 May 2018 18:47:37 +0800 Message-Id: <20180502104740.12123-22-peterx@redhat.com> In-Reply-To: <20180502104740.12123-1-peterx@redhat.com> References: <20180502104740.12123-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v8 21/24] hmp/migration: add migrate_recover command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Perevalov , "Daniel P . Berrange" , Juan Quintela , Andrea Arcangeli , "Dr . David Alan Gilbert" , peterx@redhat.com Sister command to migrate-recover in QMP. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu --- hmp.h | 1 + hmp.c | 10 ++++++++++ hmp-commands.hx | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/hmp.h b/hmp.h index 4e2ec375b0..b6b56c8161 100644 --- a/hmp.h +++ b/hmp.h @@ -68,6 +68,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); void hmp_migrate_continue(Monitor *mon, const QDict *qdict); void hmp_migrate_incoming(Monitor *mon, const QDict *qdict); +void hmp_migrate_recover(Monitor *mon, const QDict *qdict); void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict); void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict); void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict); diff --git a/hmp.c b/hmp.c index 59d5341590..4ac2126969 100644 --- a/hmp.c +++ b/hmp.c @@ -1517,6 +1517,16 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +void hmp_migrate_recover(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + const char *uri = qdict_get_str(qdict, "uri"); + + qmp_migrate_recover(uri, &err); + + hmp_handle_error(mon, &err); +} + /* Kept for backwards compatibility */ void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) { diff --git a/hmp-commands.hx b/hmp-commands.hx index 078ded20cd..8facba7b4d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -957,7 +957,20 @@ STEXI @findex migrate_incoming Continue an incoming migration using the @var{uri} (that has the same syntax as the -incoming option). +ETEXI + { + .name = "migrate_recover", + .args_type = "uri:s", + .params = "uri", + .help = "Continue a paused incoming postcopy migration", + .cmd = hmp_migrate_recover, + }, + +STEXI +@item migrate_recover @var{uri} +@findex migrate_recover +Continue a paused incoming postcopy migration using the @var{uri}. ETEXI { -- 2.14.3