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>
---
 migration/ram.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 7938a643d9..f59e3fe197 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -4375,6 +4375,7 @@ static int ram_load_precopy(QEMUFile *f)
         }
     }
 
+    ret |= wait_for_decompress_done();
     return ret;
 }
 
@@ -4406,8 +4407,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);
 
-- 
2.17.1

* Wei Yang (richardw.yang@linux.intel.com) wrote:
> 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>

OK, since your last patch does this for postcopy.


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/ram.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 7938a643d9..f59e3fe197 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -4375,6 +4375,7 @@ static int ram_load_precopy(QEMUFile *f)
>          }
>      }
>  
> +    ret |= wait_for_decompress_done();
>      return ret;
>  }
>  
> @@ -4406,8 +4407,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);
>  
> -- 
> 2.17.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK