diff options
| author | Peter Maydell | 2016-10-17 11:31:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-17 11:31:10 +0200 |
| commit | 4378caf59edf6df796b9ad3174e5703fd25a781c (patch) | |
| tree | ea5627e0532e0cbfffd103be09cff3796f5122d0 /migration/ram.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161013-1' into st... (diff) | |
| parent | docs/xbzrle: correction (diff) | |
| download | qemu-4378caf59edf6df796b9ad3174e5703fd25a781c.tar.gz qemu-4378caf59edf6df796b9ad3174e5703fd25a781c.tar.xz qemu-4378caf59edf6df796b9ad3174e5703fd25a781c.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20161014' into staging
migration/next for 20161014
# gpg: Signature made Fri 14 Oct 2016 16:24:13 BST
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20161014:
docs/xbzrle: correction
migrate: move max-bandwidth and downtime-limit to migrate_set_parameter
migration: Fix seg with missing port
migration/postcopy: Explicitly disallow huge pages
RAMBlocks: Store page size
Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8]
migrate: Fix bounds check for migration parameters in migration.c
migrate: Use boxed qapi for migrate-set-parameters
migrate: Share common MigrationParameters struct
migrate: Fix cpu-throttle-increment regression in HMP
migration/rdma: Don't flag an error when we've been told about one
migration: Make failed migration load set file error
migration/rdma: Pass qemu_file errors across link
migration: Report values for comparisons
migration: report an error giving the failed field
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c index c8ec9f268f..bc6154fe34 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -771,7 +771,9 @@ static int ram_save_page(QEMUFile *f, PageSearchStatus *pss, * page would be stale */ xbzrle_cache_zero_page(current_addr); - } else if (!ram_bulk_stage && migrate_use_xbzrle()) { + } else if (!ram_bulk_stage && + !migration_in_postcopy(migrate_get_current()) && + migrate_use_xbzrle()) { pages = save_xbzrle_page(f, &p, current_addr, block, offset, last_stage, bytes_transferred); if (!last_stage) { |