OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

postcopy: Remove the x-

Browse Source 
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 remove the experimental tag.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1457690016-9070-3-git-send-email-dgilbert@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-03-11 09:53:36 +00:00 committed by Amit Shah
parent a587a3fe6c
commit 32c3db5b26
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/migration.txt
View File

@ -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 To enable postcopy, issue this command on the monitor prior to the
start of migration: 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 The normal commands are then used to start a migration, which is still
started in precopy mode. Issuing: started in precopy mode. Issuing:

2
hmp-commands.hx
View File

@ -1026,7 +1026,7 @@ ETEXI
.args_type = "", .args_type = "",
.params = "", .params = "",
.help = "Followup to a migration command to switch the migration" .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.", "be set before the original migration command.",
.mhandler.cmd = hmp_migrate_start_postcopy, .mhandler.cmd = hmp_migrate_start_postcopy,
}, },

4
migration/migration.c
View File

@ -706,7 +706,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
*/ */
error_report("Postcopy is not currently compatible with " error_report("Postcopy is not currently compatible with "
"compression"); "compression");
s->enabled_capabilities[MIGRATION_CAPABILITY_X_POSTCOPY_RAM] = s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM] =
false; false;
} }
} }
@ -1125,7 +1125,7 @@ bool migrate_postcopy_ram(void)
s = migrate_get_current(); 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) bool migrate_auto_converge(void)

8
qapi-schema.json
View File

@ -540,15 +540,15 @@
# @auto-converge: If enabled, QEMU will automatically throttle down the guest # @auto-converge: If enabled, QEMU will automatically throttle down the guest
# to speed up convergence of RAM migration. (since 1.6) # 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 # been migrated, pulling the remaining pages along as needed. NOTE: If
# the migration fails during postcopy the VM will fail. (since 2.5) # the migration fails during postcopy the VM will fail. (since 2.6)
# #
# Since: 1.2 # Since: 1.2
## ##
{ 'enum': 'MigrationCapability', { 'enum': 'MigrationCapability',
'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks',
'compress', 'events', 'x-postcopy-ram'] } 'compress', 'events', 'postcopy-ram'] }
## ##
# @MigrationCapabilityStatus # @MigrationCapabilityStatus
@ -705,7 +705,7 @@
# @migrate-start-postcopy # @migrate-start-postcopy
# #
# Followup to a migration command to switch the 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 # The postcopy-ram capability must be set before the original migration
# command. # command.
# #
# Since: 2.5 # Since: 2.5

6
qmp-commands.hx
View File

@ -3683,7 +3683,7 @@ Enable/Disable migration capabilities
- "zero-blocks": compress zero blocks during block migration - "zero-blocks": compress zero blocks during block migration
- "compress": use multiple compression threads to accelerate live migration - "compress": use multiple compression threads to accelerate live migration
- "events": generate events for each migration state change - "events": generate events for each migration state change
- "x-postcopy-ram": postcopy mode for live migration - "postcopy-ram": postcopy mode for live migration
Arguments: Arguments:
@ -3713,7 +3713,7 @@ Query current migration capabilities
- "zero-blocks" : Zero Blocks state (json-bool) - "zero-blocks" : Zero Blocks state (json-bool)
- "compress": Multiple compression threads state (json-bool) - "compress": Multiple compression threads state (json-bool)
- "events": Migration state change event 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: Arguments:
@ -3727,7 +3727,7 @@ Example:
{"state": false, "capability": "zero-blocks"}, {"state": false, "capability": "zero-blocks"},
{"state": false, "capability": "compress"}, {"state": false, "capability": "compress"},
{"state": true, "capability": "events"}, {"state": true, "capability": "events"},
{"state": false, "capability": "x-postcopy-ram"} {"state": false, "capability": "postcopy-ram"}
]} ]}
EQMP EQMP