From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elgWC-0002KA-Gv for qemu-devel@nongnu.org; Tue, 13 Feb 2018 14:45:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elgW9-0002dG-EJ for qemu-devel@nongnu.org; Tue, 13 Feb 2018 14:45:32 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45944 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 1elgW9-0002cv-7t for qemu-devel@nongnu.org; Tue, 13 Feb 2018 14:45:29 -0500 Date: Tue, 13 Feb 2018 19:45:09 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20180213194508.GT2378@work-vm> References: <20180208103132.28452-1-peterx@redhat.com> <20180208103132.28452-27-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180208103132.28452-27-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH v6 26/28] hmp/migration: add migrate_recover command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Alexey Perevalov , "Daniel P . Berrange" , Juan Quintela , Andrea Arcangeli * Peter Xu (peterx@redhat.com) wrote: > Sister command to migrate-recover in QMP. > > Signed-off-by: Peter Xu Yes, useful for testing, although we don't have any OOB equivalent yet, something I need to look at. 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 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 > > { > 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); > } > > +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.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); > -- > 2.14.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK