summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yang2019-11-07 13:39:03 +0100
committerJuan Quintela2020-01-20 09:10:23 +0100
commitca1a6b708ba2d94f2dd64bb8ec04223a708c9b40 (patch)
tree9e9c9bbab01560e088493c7f1a24daa4f02cb425
parentmigration/postcopy: reduce memset when it is zero page and matches_target_pag... (diff)
downloadqemu-ca1a6b708ba2d94f2dd64bb8ec04223a708c9b40.tar.gz
qemu-ca1a6b708ba2d94f2dd64bb8ec04223a708c9b40.tar.xz
qemu-ca1a6b708ba2d94f2dd64bb8ec04223a708c9b40.zip
migration/postcopy: wait for decompress thread in precopy
Compress is not supported with postcopy, it is safe to wait for decompress thread just in precopy. This is a preparation for later patch. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/migration/ram.c b/migration/ram.c
index bdb0316892..c13b44b4d9 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -4421,6 +4421,7 @@ static int ram_load_precopy(QEMUFile *f)
}
}
+ ret |= wait_for_decompress_done();
return ret;
}
@@ -4452,8 +4453,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
} else {
ret = ram_load_precopy(f);
}
-
- ret |= wait_for_decompress_done();
}
trace_ram_load_complete(ret, seq_iter);