diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2016-08-24 18:15:46 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@trasno.org> | 2016-10-13 17:23:53 +0200 |
| commit | 2ebeaec012b4e5695612774c44f14c61ab46c72c (patch) | |
| tree | d7a492d4699a7240ad7ff7c5bd41bc11928a082e | |
| parent | 091ecc8b69bd735383e171828d4e8ed5e34c2a3b (diff) | |
| download | focaccia-qemu-2ebeaec012b4e5695612774c44f14c61ab46c72c.tar.gz focaccia-qemu-2ebeaec012b4e5695612774c44f14c61ab46c72c.zip | |
Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8]
xbzrle relies on reading pages that have already been sent to the destination and then applying the modifications; we can't do that in postcopy because the destination may well have modified the page already or the page has been discarded. I already didn't allow reception of xbzrle pages, but I forgot to add the test to stop them being sent. Enabling both xbzrle and postcopy can make some sense; if you think that your migration might finish if you have xbzrle, then when it doesn't complete you flick over to postcopy and stop xbzrle'ing. This corresponds to RH bug: https://bugzilla.redhat.com/show_bug.cgi?id=1368422 Symptom is: Unknown combination of migration flags: 0x60 (postcopy mode) (either 0x60 or 0x40) Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -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) { |