| Message ID | 20180208103132.28452-29-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v6,01/28] migration: better error handling with QEMUFile | expand |
* Peter Xu (peterx@redhat.com) wrote: > Wrapper for QMP command "migrate-pause". > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hmp-commands.hx | 14 ++++++++++++++ > hmp.c | 9 +++++++++ > hmp.h | 1 + > 3 files changed, 24 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 7563f3eaa0..32549702ee 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -969,6 +969,20 @@ STEXI > @item migrate_recover @var{uri} > @findex migrate_recover > Continue a paused incoming postcopy migration using the @var{uri}. > +ETEXI > + > + { > + .name = "migrate_pause", > + .args_type = "", > + .params = "", > + .help = "Pause an ongoing migration (postcopy-only)", > + .cmd = hmp_migrate_pause, > + }, > + > +STEXI > +@item migrate_pause > +@findex migrate_pause > +Pause an ongoing migration. Currently it only supports postcopy. > ETEXI > > { > diff --git a/hmp.c b/hmp.c > index 4062d3fdba..ae6266cb21 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1529,6 +1529,15 @@ void hmp_migrate_recover(Monitor *mon, const QDict *qdict) > hmp_handle_error(mon, &err); > } > > +void hmp_migrate_pause(Monitor *mon, const QDict *qdict) > +{ > + Error *err = NULL; > + > + qmp_migrate_pause(&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 0d53fe78d9..0aa8dca738 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -71,6 +71,7 @@ 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_pause(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
diff --git a/hmp-commands.hx b/hmp-commands.hx index 7563f3eaa0..32549702ee 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -969,6 +969,20 @@ STEXI @item migrate_recover @var{uri} @findex migrate_recover Continue a paused incoming postcopy migration using the @var{uri}. +ETEXI + + { + .name = "migrate_pause", + .args_type = "", + .params = "", + .help = "Pause an ongoing migration (postcopy-only)", + .cmd = hmp_migrate_pause, + }, + +STEXI +@item migrate_pause +@findex migrate_pause +Pause an ongoing migration. Currently it only supports postcopy. ETEXI { diff --git a/hmp.c b/hmp.c index 4062d3fdba..ae6266cb21 100644 --- a/hmp.c +++ b/hmp.c @@ -1529,6 +1529,15 @@ void hmp_migrate_recover(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } +void hmp_migrate_pause(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + + qmp_migrate_pause(&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 0d53fe78d9..0aa8dca738 100644 --- a/hmp.h +++ b/hmp.h @@ -71,6 +71,7 @@ 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_pause(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);
Wrapper for QMP command "migrate-pause". Signed-off-by: Peter Xu <peterx@redhat.com> --- hmp-commands.hx | 14 ++++++++++++++ hmp.c | 9 +++++++++ hmp.h | 1 + 3 files changed, 24 insertions(+)