| Message ID | 1457553016-1869-3-git-send-email-dgilbert@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/09/2016 12:50 PM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Postcopy seems to have survived a cycle with only a few fixes, > and Jiri has the current libvirt wired up and working > ( https://www.redhat.com/archives/libvir-list/2016-March/msg00080.html ) > so lets remove the experimental tag. s/lets/let's/ (in this case, you are contracting "let us") Does the balance of the universe stay the same by moving the apostrophe from 1/2 into this one? :) > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > +++ b/qapi-schema.json > @@ -540,7 +540,7 @@ > # @auto-converge: If enabled, QEMU will automatically throttle down the guest > # to speed up convergence of RAM migration. (since 1.6) > # > -# @x-postcopy-ram: Start executing on the migration target before all of RAM has > +# @postcopy-ram: Start executing on the migration target before all of RAM has > # been migrated, pulling the remaining pages along as needed. NOTE: If > # the migration fails during postcopy the VM will fail. (since 2.5) s/2.5/2.6/ - we want to advertise when the non-experimental name existed (compare to commit 6575ccdd dropping the x- from input-send-event). With that tweak, Reviewed-by: Eric Blake <eblake@redhat.com>
* Eric Blake (eblake@redhat.com) wrote: > On 03/09/2016 12:50 PM, Dr. David Alan Gilbert (git) wrote: > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > Postcopy seems to have survived a cycle with only a few fixes, > > and Jiri has the current libvirt wired up and working > > ( https://www.redhat.com/archives/libvir-list/2016-March/msg00080.html ) > > so lets remove the experimental tag. > > s/lets/let's/ (in this case, you are contracting "let us") Thanks. > Does the balance of the universe stay the same by moving the apostrophe > from 1/2 into this one? :) Damn, you've figured out my scheme. > > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > --- > > > +++ b/qapi-schema.json > > @@ -540,7 +540,7 @@ > > # @auto-converge: If enabled, QEMU will automatically throttle down the guest > > # to speed up convergence of RAM migration. (since 1.6) > > # > > -# @x-postcopy-ram: Start executing on the migration target before all of RAM has > > +# @postcopy-ram: Start executing on the migration target before all of RAM has > > # been migrated, pulling the remaining pages along as needed. NOTE: If > > # the migration fails during postcopy the VM will fail. (since 2.5) > > s/2.5/2.6/ - we want to advertise when the non-experimental name existed > (compare to commit 6575ccdd dropping the x- from input-send-event). > > With that tweak, > Reviewed-by: Eric Blake <eblake@redhat.com> > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/docs/migration.txt b/docs/migration.txt index fda8d61..90209ab 100644 --- a/docs/migration.txt +++ b/docs/migration.txt @@ -333,7 +333,7 @@ doesn't finish in a given time the switch is made to postcopy. To enable postcopy, issue this command on the monitor prior to the start of migration: -migrate_set_capability x-postcopy-ram on +migrate_set_capability postcopy-ram on The normal commands are then used to start a migration, which is still started in precopy mode. Issuing: diff --git a/hmp-commands.hx b/hmp-commands.hx index 664d794..639205b 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1026,7 +1026,7 @@ ETEXI .args_type = "", .params = "", .help = "Followup to a migration command to switch the migration" - " to postcopy mode. The x-postcopy-ram capability must " + " to postcopy mode. The postcopy-ram capability must " "be set before the original migration command.", .mhandler.cmd = hmp_migrate_start_postcopy, }, diff --git a/migration/migration.c b/migration/migration.c index 7d13377..34e0c22 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -706,7 +706,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, */ error_report("Postcopy is not currently compatible with " "compression"); - s->enabled_capabilities[MIGRATION_CAPABILITY_X_POSTCOPY_RAM] = + s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM] = false; } } @@ -1125,7 +1125,7 @@ bool migrate_postcopy_ram(void) s = migrate_get_current(); - return s->enabled_capabilities[MIGRATION_CAPABILITY_X_POSTCOPY_RAM]; + return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM]; } bool migrate_auto_converge(void) diff --git a/qapi-schema.json b/qapi-schema.json index 362c9d8..69e01a4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -540,7 +540,7 @@ # @auto-converge: If enabled, QEMU will automatically throttle down the guest # to speed up convergence of RAM migration. (since 1.6) # -# @x-postcopy-ram: Start executing on the migration target before all of RAM has +# @postcopy-ram: Start executing on the migration target before all of RAM has # been migrated, pulling the remaining pages along as needed. NOTE: If # the migration fails during postcopy the VM will fail. (since 2.5) # @@ -548,7 +548,7 @@ ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', - 'compress', 'events', 'x-postcopy-ram'] } + 'compress', 'events', 'postcopy-ram'] } ## # @MigrationCapabilityStatus @@ -705,7 +705,7 @@ # @migrate-start-postcopy # # Followup to a migration command to switch the migration to postcopy mode. -# The x-postcopy-ram capability must be set before the original migration +# The postcopy-ram capability must be set before the original migration # command. # # Since: 2.5 diff --git a/qmp-commands.hx b/qmp-commands.hx index b629673..9e05365 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3683,7 +3683,7 @@ Enable/Disable migration capabilities - "zero-blocks": compress zero blocks during block migration - "compress": use multiple compression threads to accelerate live migration - "events": generate events for each migration state change -- "x-postcopy-ram": postcopy mode for live migration +- "postcopy-ram": postcopy mode for live migration Arguments: @@ -3713,7 +3713,7 @@ Query current migration capabilities - "zero-blocks" : Zero Blocks state (json-bool) - "compress": Multiple compression threads state (json-bool) - "events": Migration state change event state (json-bool) - - "x-postcopy-ram": postcopy ram state (json-bool) + - "postcopy-ram": postcopy ram state (json-bool) Arguments: @@ -3727,7 +3727,7 @@ Example: {"state": false, "capability": "zero-blocks"}, {"state": false, "capability": "compress"}, {"state": true, "capability": "events"}, - {"state": false, "capability": "x-postcopy-ram"} + {"state": false, "capability": "postcopy-ram"} ]} EQMP