diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 18:08:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 18:08:19 +0000 |
| commit | f3bcfc5663646f74e62fe9d3d8774b8f0adda7bf (patch) | |
| tree | 9a1d35e8a5be2a048e94a8abe6e85d92b4accbdb /qapi-schema.json | |
| parent | b2df6a79df6343d0ed4ea05d83b3ff1d849e8d25 (diff) | |
| parent | 389775d1f67b2c8f44f9473b1e5363735972e389 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151112' into staging
migration/next for 20151112
# gpg: Signature made Thu 12 Nov 2015 16:56:44 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
* remotes/juanquintela/tags/migration/20151112:
migration_init: Fix lock initialisation/make it explicit
migrate-start-postcopy: Improve text
Postcopy: Fix TP!=HP zero case
Finish non-postcopiable iterative devices before package
migration: Make 32bit linux compile with RDMA
migration: print ram_addr_t as RAM_ADDR_FMT not %zx
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 36e59b8932..b65905f4d6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -706,7 +706,9 @@ ## # @migrate-start-postcopy # -# Switch migration to postcopy mode +# Followup to a migration command to switch the migration to postcopy mode. +# The x-postcopy-ram capability must be set before the original migration +# command. # # Since: 2.5 { 'command': 'migrate-start-postcopy' } |