]> git.proxmox.com Git - mirror_qemu.git/commitdiff
migration/postcopy: wait for decompress thread in precopy
authorWei Yang <richardw.yang@linux.intel.com>
Thu, 7 Nov 2019 12:39:03 +0000 (20:39 +0800)
committerJuan Quintela <quintela@redhat.com>
Mon, 20 Jan 2020 08:10:23 +0000 (09:10 +0100)
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>
migration/ram.c

index bdb0316892739b59dac50da174feed96da60ff5f..c13b44b4d9bebbf1bee49256fb4b3c045ad45693 100644 (file)
@@ -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);