[PATCH v2 1/6] migration: Properly destroy variables on incoming side

Peter Xu posted 6 patches 5 years, 2 months ago
Maintainers: Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
There is a newer version of this series
[PATCH v2 1/6] migration: Properly destroy variables on incoming side
Posted by Peter Xu 5 years, 2 months ago
In migration_incoming_state_destroy(), we've got a few variables that aren't
destroyed properly, namely:

    main_thread_load_event
    postcopy_pause_sem_dst
    postcopy_pause_sem_fault
    rp_mutex

Destroy them properly.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index 58a5452471..749d9b145b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -238,12 +238,15 @@ void migration_incoming_state_destroy(void)
         mis->postcopy_remote_fds = NULL;
     }
 
-    qemu_event_reset(&mis->main_thread_load_event);
-
     if (mis->socket_address_list) {
         qapi_free_SocketAddressList(mis->socket_address_list);
         mis->socket_address_list = NULL;
     }
+
+    qemu_event_destroy(&mis->main_thread_load_event);
+    qemu_sem_destroy(&mis->postcopy_pause_sem_dst);
+    qemu_sem_destroy(&mis->postcopy_pause_sem_fault);
+    qemu_mutex_destroy(&mis->rp_mutex);
 }
 
 static void migrate_generate_event(int new_state)
-- 
2.26.2


Re: [PATCH v2 1/6] migration: Properly destroy variables on incoming side
Posted by Dr. David Alan Gilbert 5 years, 2 months ago
* Peter Xu (peterx@redhat.com) wrote:
> In migration_incoming_state_destroy(), we've got a few variables that aren't
> destroyed properly, namely:
> 
>     main_thread_load_event
>     postcopy_pause_sem_dst
>     postcopy_pause_sem_fault
>     rp_mutex
> 
> Destroy them properly.
> 
> Signed-off-by: Peter Xu <peterx@redhat.com>

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

> ---
>  migration/migration.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 58a5452471..749d9b145b 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -238,12 +238,15 @@ void migration_incoming_state_destroy(void)
>          mis->postcopy_remote_fds = NULL;
>      }
>  
> -    qemu_event_reset(&mis->main_thread_load_event);
> -
>      if (mis->socket_address_list) {
>          qapi_free_SocketAddressList(mis->socket_address_list);
>          mis->socket_address_list = NULL;
>      }
> +
> +    qemu_event_destroy(&mis->main_thread_load_event);
> +    qemu_sem_destroy(&mis->postcopy_pause_sem_dst);
> +    qemu_sem_destroy(&mis->postcopy_pause_sem_fault);
> +    qemu_mutex_destroy(&mis->rp_mutex);
>  }
>  
>  static void migrate_generate_event(int new_state)
> -- 
> 2.26.2
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK