| Message ID | 1423673184-5903-3-git-send-email-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 02/11/2015 09:46 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Add migrate_incoming/migrate-incoming to start an incoming > migration. > > Once a qemu has been started with > -incoming pause > > the migration can be started by issuing: > migrate_incoming uri > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > hmp-commands.hx | 16 ++++++++++++++++ > hmp.c | 14 ++++++++++++++ > hmp.h | 1 + > migration/migration.c | 19 +++++++++++++++++++ > qapi-schema.json | 15 +++++++++++++++ > qmp-commands.hx | 31 ++++++++++++++++++++++++++++++- > 6 files changed, 95 insertions(+), 1 deletion(-) > > +++ b/migration/migration.c > @@ -432,6 +432,25 @@ void migrate_del_blocker(Error *reason) > migration_blockers = g_slist_remove(migration_blockers, reason); > } > > +void qmp_migrate_incoming(const char *uri, Error **errp) > +{ > + Error *local_err = NULL; > + > + if (!paused_incoming) { > + error_setg(errp, "-incoming pause is required for migrate_incoming"); Might read easier as "'-incoming pause' is required...", but that's minor. Reviewed-by: Eric Blake <eblake@redhat.com>
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Add migrate_incoming/migrate-incoming to start an incoming > migration. > > Once a qemu has been started with > -incoming pause > > the migration can be started by issuing: > migrate_incoming uri > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> > + .name = "migrate_incoming", > + .args_type = "uri:s", > + .params = "uri", > + .help = "Unpause an incoming migration from an -incoming pause", > + .mhandler.cmd = hmp_migrate_incoming, > + }, As you know, I am a funny man, so ..... (qemu) migrate_incoming paused funny, right? Not that --incomining in general is well prepared for abuse O:-)
* Juan Quintela (quintela@redhat.com) wrote: > "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote: > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > Add migrate_incoming/migrate-incoming to start an incoming > > migration. > > > > Once a qemu has been started with > > -incoming pause > > > > the migration can be started by issuing: > > migrate_incoming uri > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > Reviewed-by: Juan Quintela <quintela@redhat.com> > > > + .name = "migrate_incoming", > > + .args_type = "uri:s", > > + .params = "uri", > > + .help = "Unpause an incoming migration from an -incoming pause", > > + .mhandler.cmd = hmp_migrate_incoming, > > + }, > > As you know, I am a funny man, so ..... > > (qemu) migrate_incoming paused > > funny, right? (qemu) migrate_incoming paused unknown migration protocol: paused (qemu) migrate_incoming pause Pausing an already paused incoming migration Didn't want to let you get away with that :-) > Not that --incomining in general is well prepared for abuse O:-) Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Eric Blake <eblake@redhat.com> wrote: > On 02/11/2015 09:46 AM, Dr. David Alan Gilbert (git) wrote: >> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> >> Add migrate_incoming/migrate-incoming to start an incoming >> migration. >> >> Once a qemu has been started with >> -incoming pause >> >> the migration can be started by issuing: >> migrate_incoming uri >> >> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> >> --- >> hmp-commands.hx | 16 ++++++++++++++++ >> hmp.c | 14 ++++++++++++++ >> hmp.h | 1 + >> migration/migration.c | 19 +++++++++++++++++++ >> qapi-schema.json | 15 +++++++++++++++ >> qmp-commands.hx | 31 ++++++++++++++++++++++++++++++- >> 6 files changed, 95 insertions(+), 1 deletion(-) >> > >> +++ b/migration/migration.c >> @@ -432,6 +432,25 @@ void migrate_del_blocker(Error *reason) >> migration_blockers = g_slist_remove(migration_blockers, reason); >> } >> >> +void qmp_migrate_incoming(const char *uri, Error **errp) >> +{ >> + Error *local_err = NULL; >> + >> + if (!paused_incoming) { >> + error_setg(errp, "-incoming pause is required for migrate_incoming"); > > Might read easier as "'-incoming pause' is required...", but that's minor. > > Reviewed-by: Eric Blake <eblake@redhat.com> As this is a very minor fix, I apply it by hand on my tree. Thanks to all reviewers. Applied, Juan.
diff --git a/hmp-commands.hx b/hmp-commands.hx index e37bc8b..d889b73 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -922,6 +922,22 @@ Cancel the current VM migration. ETEXI { + .name = "migrate_incoming", + .args_type = "uri:s", + .params = "uri", + .help = "Unpause an incoming migration from an -incoming pause", + .mhandler.cmd = hmp_migrate_incoming, + }, + +STEXI +@item migrate_incoming @var{uri} +@findex migrate_incoming +Unpause an incoming migration using the @var{uri} (that has the same syntax +as the -incoming option). + +ETEXI + + { .name = "migrate_set_cache_size", .args_type = "value:o", .params = "value", diff --git a/hmp.c b/hmp.c index b47f331..f051896 100644 --- a/hmp.c +++ b/hmp.c @@ -1083,6 +1083,20 @@ void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) qmp_migrate_cancel(NULL); } +void hmp_migrate_incoming(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + const char *uri = qdict_get_str(qdict, "uri"); + + qmp_migrate_incoming(uri, &err); + + if (err) { + monitor_printf(mon, "%s\n", error_get_pretty(err)); + error_free(err); + return; + } +} + void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict) { double value = qdict_get_double(qdict, "value"); diff --git a/hmp.h b/hmp.h index 4bb5dca..95efe63 100644 --- a/hmp.h +++ b/hmp.h @@ -60,6 +60,7 @@ void hmp_snapshot_delete_blkdev_internal(Monitor *mon, const QDict *qdict); void hmp_drive_mirror(Monitor *mon, const QDict *qdict); void hmp_drive_backup(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(Monitor *mon, const QDict *qdict); +void hmp_migrate_incoming(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/migration/migration.c b/migration/migration.c index 77263a5..c9f482d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -432,6 +432,25 @@ void migrate_del_blocker(Error *reason) migration_blockers = g_slist_remove(migration_blockers, reason); } +void qmp_migrate_incoming(const char *uri, Error **errp) +{ + Error *local_err = NULL; + + if (!paused_incoming) { + error_setg(errp, "-incoming pause is required for migrate_incoming"); + return; + } + + qemu_start_incoming_migration(uri, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + return; + } + + paused_incoming = false; +} + void qmp_migrate(const char *uri, bool has_blk, bool blk, bool has_inc, bool inc, bool has_detach, bool detach, Error **errp) diff --git a/qapi-schema.json b/qapi-schema.json index e16f8eb..6093696 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1738,6 +1738,21 @@ { 'command': 'migrate', 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } +## +# @migrate-incoming +# +# Start an incoming migration, the qemu must have been started +# with -incoming pause +# +# @uri: The Uniform Resource Identifier identifying the source or +# address to listen on +# +# Returns: nothing on success +# +# Since: 2.3 +## +{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } } + # @xen-save-devices-state: # # Save the state of all devices to file. The RAM and the block devices diff --git a/qmp-commands.hx b/qmp-commands.hx index a85d847..79593fe 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -661,7 +661,36 @@ Example: <- { "return": {} } EQMP -{ + + { + .name = "migrate-incoming", + .args_type = "uri:s", + .mhandler.cmd_new = qmp_marshal_input_migrate_incoming, + }, + +SQMP +migrate-incoming +---------------- + +Unpause an incoming migration + +Arguments: + +- "uri": Source/listening URI (json-string) + +Example: + +-> { "execute": "migrate-incoming", "arguments": { "uri": "tcp::4446" } } +<- { "return": {} } + +Notes: + +(1) QEMU must be started with -incoming pause to allow migrate-incoming to + be used +(2) The uri format is the same as to -incoming + +EQMP + { .name = "migrate-set-cache-size", .args_type = "value:o", .mhandler.cmd_new = qmp_marshal_input_migrate_set_cache_size,