ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: per-mode notifiers 

Keep a separate list of migration notifiers for each migration mode.

Suggested-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/1708622920-68779-8-git-send-email-steven.sistare@oracle.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Steve Sistare 2024-02-22 09:28:33 -08:00 committed by Peter Xu
parent 5663dd3f1a
commit 6835f5a1bc
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/migration/misc.h
View File

@ -86,6 +86,12 @@ typedef int (*MigrationNotifyFunc)(NotifierWithReturn *notify,
void migration_add_notifier(NotifierWithReturn *notify, void migration_add_notifier(NotifierWithReturn *notify,
MigrationNotifyFunc func); MigrationNotifyFunc func);
/*
* Same as migration_add_notifier, but applies to be specified @mode.
*/
void migration_add_notifier_mode(NotifierWithReturn *notify,
MigrationNotifyFunc func, MigMode mode);
void migration_remove_notifier(NotifierWithReturn *notify); void migration_remove_notifier(NotifierWithReturn *notify);
void migration_call_notifiers(MigrationState *s, MigrationEventType type); void migration_call_notifiers(MigrationState *s, MigrationEventType type);
bool migration_in_setup(MigrationState *); bool migration_in_setup(MigrationState *);

22
migration/migration.c
View File

@ -69,8 +69,13 @@
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
static NotifierWithReturnList migration_state_notifiers = #define NOTIFIER_ELEM_INIT(array, elem) \
NOTIFIER_WITH_RETURN_LIST_INITIALIZER(migration_state_notifiers); [elem] = NOTIFIER_WITH_RETURN_LIST_INITIALIZER((array)[elem])
static NotifierWithReturnList migration_state_notifiers[] = {
NOTIFIER_ELEM_INIT(migration_state_notifiers, MIG_MODE_NORMAL),
NOTIFIER_ELEM_INIT(migration_state_notifiers, MIG_MODE_CPR_REBOOT),
};
/* Messages sent on the return path from destination to source */ /* Messages sent on the return path from destination to source */
enum mig_rp_message_type { enum mig_rp_message_type {
@ -1463,11 +1468,17 @@ static void migrate_fd_cancel(MigrationState *s)
} }
} }
void migration_add_notifier_mode(NotifierWithReturn *notify,
MigrationNotifyFunc func, MigMode mode)
{
notify->notify = (NotifierWithReturnFunc)func;
notifier_with_return_list_add(&migration_state_notifiers[mode], notify);
}
void migration_add_notifier(NotifierWithReturn *notify, void migration_add_notifier(NotifierWithReturn *notify,
MigrationNotifyFunc func) MigrationNotifyFunc func)
{ {
notify->notify = (NotifierWithReturnFunc)func; migration_add_notifier_mode(notify, func, MIG_MODE_NORMAL);
notifier_with_return_list_add(&migration_state_notifiers, notify);
} }
void migration_remove_notifier(NotifierWithReturn *notify) void migration_remove_notifier(NotifierWithReturn *notify)
@ -1480,10 +1491,11 @@ void migration_remove_notifier(NotifierWithReturn *notify)
void migration_call_notifiers(MigrationState *s, MigrationEventType type) void migration_call_notifiers(MigrationState *s, MigrationEventType type)
{ {
MigMode mode = s->parameters.mode;
MigrationEvent e; MigrationEvent e;
e.type = type; e.type = type;
notifier_with_return_list_notify(&migration_state_notifiers, &e, 0); notifier_with_return_list_notify(&migration_state_notifiers[mode], &e, 0);
} }
bool migration_in_setup(MigrationState *s) bool migration_in_setup(MigrationState *s)