RE: [PATCH 3/3] migration/colo: Tidy up bql_unlock() around bdrv_activate_all()

[Zhang, Chen]

> -Original Message-
> From: Li Zhijian 
> Sent: Thursday, May 9, 2024 11:31 AM
> To: Peter Xu ; Fabiano Rosas 
> Cc: Zhang, Hailiang ; qemu-
> de...@nongnu.org; Zhang, Chen ; Li Zhijian
> ; Michael Tokarev 
> Subject: [PATCH 3/3] migration/colo: Tidy up bql_unlock() around
> bdrv_activate_all()
> 
> Make the code more tight.
> 
> Cc: Michael Tokarev 
> Signed-off-by: Li Zhijian 

Reviewed-by: Zhang Chen 

Thanks
Chen

> ---
> This change/comment suggested by "Michael Tokarev "
> came a bit late at that time, let's update it together in these minor set this
> time.
> ---
>  migration/colo.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/migration/colo.c b/migration/colo.c index 991806c06a..1b6d9da1c8
> 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -838,12 +838,11 @@ static void *colo_process_incoming_thread(void
> *opaque)
>  /* Make sure all file formats throw away their mutable metadata */
>  bql_lock();
>  bdrv_activate_all(_err);
> +bql_unlock();
>  if (local_err) {
> -bql_unlock();
>  error_report_err(local_err);
>  return NULL;
>  }
> -bql_unlock();
> 
>  failover_init_state();
> 
> --
> 2.31.1

Re: [PATCH 3/3] migration/colo: Tidy up bql_unlock() around bdrv_activate_all()

[Peter Xu]

On Thu, May 09, 2024 at 11:31:06AM +0800, Li Zhijian via wrote:
> Make the code more tight.
> 
> Cc: Michael Tokarev 
> Signed-off-by: Li Zhijian 

Reviewed-by: Peter Xu 

> ---
> This change/comment suggested by "Michael Tokarev " came
> a bit late at that time, let's update it together in these minor set
> this time.

You can use a tag next time:

Suggested-by: Michael Tokarev 

> ---
>  migration/colo.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/migration/colo.c b/migration/colo.c
> index 991806c06a..1b6d9da1c8 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -838,12 +838,11 @@ static void *colo_process_incoming_thread(void *opaque)
>  /* Make sure all file formats throw away their mutable metadata */
>  bql_lock();
>  bdrv_activate_all(_err);
> +bql_unlock();
>  if (local_err) {
> -bql_unlock();
>  error_report_err(local_err);
>  return NULL;
>  }
> -bql_unlock();
>  
>  failover_init_state();
>  
> -- 
> 2.31.1
> 
> 

-- 
Peter Xu

[PATCH 3/3] migration/colo: Tidy up bql_unlock() around bdrv_activate_all()

[Li Zhijian via]

Make the code more tight.

Cc: Michael Tokarev 
Signed-off-by: Li Zhijian 
---
This change/comment suggested by "Michael Tokarev " came
a bit late at that time, let's update it together in these minor set
this time.
---
 migration/colo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/migration/colo.c b/migration/colo.c
index 991806c06a..1b6d9da1c8 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -838,12 +838,11 @@ static void *colo_process_incoming_thread(void *opaque)
 /* Make sure all file formats throw away their mutable metadata */
 bql_lock();
 bdrv_activate_all(_err);
+bql_unlock();
 if (local_err) {
-bql_unlock();
 error_report_err(local_err);
 return NULL;
 }
-bql_unlock();
 
 failover_init_state();
 
-- 
2.31.1