[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/15] Postcopy vs xbzrle: Don't send xbzrle pages on
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 10/15] Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8] |
Date: |
Wed, 5 Oct 2016 15:45:04 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index c8ec9f2..bc6154f 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) {
--
2.7.4
- [Qemu-devel] [PULL 00/15] Migration, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 01/15] migration: report an error giving the failed field, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 04/15] migration: Make failed migration load set file error, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 03/15] migration/rdma: Pass qemu_file errors across link, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 02/15] migration: Report values for comparisons, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 06/15] migrate: Fix cpu-throttle-increment regression in HMP, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 05/15] migration/rdma: Don't flag an error when we've been told about one, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 07/15] migrate: Share common MigrationParameters struct, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 08/15] migrate: Use boxed qapi for migrate-set-parameters, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 09/15] migrate: Fix bounds check for migration parameters in migration.c, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 10/15] Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8],
Juan Quintela <=
- [Qemu-devel] [PULL 12/15] migration/postcopy: Explicitly disallow huge pages, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 13/15] migration: Fix seg with missing port, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 14/15] migrate: move max-bandwidth and downtime-limit to migrate_set_parameter, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 11/15] RAMBlocks: Store page size, Juan Quintela, 2016/10/05
- [Qemu-devel] [PULL 15/15] docs/xbzrle: correction, Juan Quintela, 2016/10/05
- Re: [Qemu-devel] [PULL 00/15] Migration, Peter Maydell, 2016/10/06