[PATCH] migration: set correct list pointer when removing notifier

[PATCH] migration: set correct list pointer when removing notifier

[Matthew Rosato]

In migration_remove_notifier(), g_slist_remove() will search for and
potentially remove an entry from the specified list.  The return value
should be used to update the potentially-changed head pointer of the
list that was just searched (migration_state_notifiers[mode]) instead
of the migration blockers list.

Fixes: dc79c7d5e1 ("migration: multi-mode notifier")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
---
 migration/migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index c2daab6bdd..9e787749b2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1693,7 +1693,7 @@ void migration_remove_notifier(NotifierWithReturn *notify)
 {
     if (notify->notify) {
         for (MigMode mode = 0; mode < MIG_MODE__MAX; mode++) {
-            migration_blockers[mode] =
+            migration_state_notifiers[mode] =
                 g_slist_remove(migration_state_notifiers[mode], notify);
         }
         notify->notify = NULL;
-- 
2.51.1

Re: [PATCH] migration: set correct list pointer when removing notifier

[Cédric Le Goater]

On 11/13/25 22:35, Matthew Rosato wrote:
> In migration_remove_notifier(), g_slist_remove() will search for and
> potentially remove an entry from the specified list.  The return value
> should be used to update the potentially-changed head pointer of the
> list that was just searched (migration_state_notifiers[mode]) instead
> of the migration blockers list.
> 
> Fixes: dc79c7d5e1 ("migration: multi-mode notifier")
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
>   migration/migration.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c2daab6bdd..9e787749b2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1693,7 +1693,7 @@ void migration_remove_notifier(NotifierWithReturn *notify)
>   {
>       if (notify->notify) {
>           for (MigMode mode = 0; mode < MIG_MODE__MAX; mode++) {
> -            migration_blockers[mode] =
> +            migration_state_notifiers[mode] =
>                   g_slist_remove(migration_state_notifiers[mode], notify);
>           }
>           notify->notify = NULL;


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

Re: [PATCH] migration: set correct list pointer when removing notifier

[Peter Xu]

On Thu, Nov 13, 2025 at 04:35:45PM -0500, Matthew Rosato wrote:
> In migration_remove_notifier(), g_slist_remove() will search for and
> potentially remove an entry from the specified list.  The return value
> should be used to update the potentially-changed head pointer of the
> list that was just searched (migration_state_notifiers[mode]) instead
> of the migration blockers list.
> 
> Fixes: dc79c7d5e1 ("migration: multi-mode notifier")
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> ---
>  migration/migration.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index c2daab6bdd..9e787749b2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1693,7 +1693,7 @@ void migration_remove_notifier(NotifierWithReturn *notify)
>  {
>      if (notify->notify) {
>          for (MigMode mode = 0; mode < MIG_MODE__MAX; mode++) {
> -            migration_blockers[mode] =
> +            migration_state_notifiers[mode] =
>                  g_slist_remove(migration_state_notifiers[mode], notify);
>          }
>          notify->notify = NULL;
> -- 
> 2.51.1
> 

queued, thanks.

-- 
Peter Xu