From nobody Mon Feb 9 12:10:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151808720671141.83154213549369; Thu, 8 Feb 2018 02:53:26 -0800 (PST) Received: from localhost ([::1]:42028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejjpO-00085r-0R for importer@patchew.org; Thu, 08 Feb 2018 05:53:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejjVm-0007Ko-C5 for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:33:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejjVh-0005rz-Gf for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:33:02 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36040 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 1ejjVh-0005rZ-Aj for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:32:57 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A6ABF7C6BB; Thu, 8 Feb 2018 10:32:56 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-120.nay.redhat.com [10.66.14.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 237552166BAE; Thu, 8 Feb 2018 10:32:53 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 8 Feb 2018 18:31:30 +0800 Message-Id: <20180208103132.28452-27-peterx@redhat.com> In-Reply-To: <20180208103132.28452-1-peterx@redhat.com> References: <20180208103132.28452-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 08 Feb 2018 10:32:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 08 Feb 2018 10:32:56 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v6 26/28] hmp/migration: add migrate_recover command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrea Arcangeli , Juan Quintela , Alexey Perevalov , peterx@redhat.com, "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Sister command to migrate-recover in QMP. Signed-off-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 10 ++++++++++ hmp.h | 1 + 3 files changed, 24 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 28ed5a7a13..7563f3eaa0 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -955,7 +955,20 @@ STEXI @findex migrate_incoming Continue an incoming migration using the @var{uri} (that has the same synt= ax as the -incoming option). +ETEXI =20 + { + .name =3D "migrate_recover", + .args_type =3D "uri:s", + .params =3D "uri", + .help =3D "Continue a paused incoming postcopy migration", + .cmd =3D hmp_migrate_recover, + }, + +STEXI +@item migrate_recover @var{uri} +@findex migrate_recover +Continue a paused incoming postcopy migration using the @var{uri}. ETEXI =20 { diff --git a/hmp.c b/hmp.c index 6f8eec8365..4062d3fdba 100644 --- a/hmp.c +++ b/hmp.c @@ -1519,6 +1519,16 @@ void hmp_migrate_incoming(Monitor *mon, const QDict = *qdict) hmp_handle_error(mon, &err); } =20 +void hmp_migrate_recover(Monitor *mon, const QDict *qdict) +{ + Error *err =3D NULL; + const char *uri =3D 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.h b/hmp.h index 536cb91caa..0d53fe78d9 100644 --- a/hmp.h +++ b/hmp.h @@ -70,6 +70,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); --=20 2.14.3