OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: MigrationNotifyFunc

Browse Source 
Define MigrationNotifyFunc to improve type safety and simplify migration
notifiers.

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-7-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:32 -08:00 committed by Peter Xu
parent c763a23e41
commit 5663dd3f1a
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/virtio-net.c
View File

@ -3535,10 +3535,8 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationEvent *e)
} }
static int virtio_net_migration_state_notifier(NotifierWithReturn *notifier, static int virtio_net_migration_state_notifier(NotifierWithReturn *notifier,
void *data, Error **errp) MigrationEvent *e, Error **errp)
{ {
MigrationEvent *e = data;
VirtIONet *n = container_of(notifier, VirtIONet, migration_state); VirtIONet *n = container_of(notifier, VirtIONet, migration_state);
virtio_net_handle_migration_primary(n, e); virtio_net_handle_migration_primary(n, e);
return 0; return 0;

3
hw/vfio/migration.c
View File

@ -755,9 +755,8 @@ static void vfio_vmstate_change(void *opaque, bool running, RunState state)
} }
static int vfio_migration_state_notifier(NotifierWithReturn *notifier, static int vfio_migration_state_notifier(NotifierWithReturn *notifier,
void *data, Error **errp) MigrationEvent *e, Error **errp)
{ {
MigrationEvent *e = data;
VFIOMigration *migration = container_of(notifier, VFIOMigration, VFIOMigration *migration = container_of(notifier, VFIOMigration,
migration_state); migration_state);
VFIODevice *vbasedev = migration->vbasedev; VFIODevice *vbasedev = migration->vbasedev;

5
include/migration/misc.h
View File

@ -72,6 +72,9 @@ typedef struct MigrationEvent {
MigrationEventType type; MigrationEventType type;
} MigrationEvent; } MigrationEvent;
typedef int (*MigrationNotifyFunc)(NotifierWithReturn *notify,
MigrationEvent *e, Error **errp);
/* /*
* Register the notifier @notify to be called when a migration event occurs * Register the notifier @notify to be called when a migration event occurs
* for MIG_MODE_NORMAL, as specified by the MigrationEvent passed to @func. * for MIG_MODE_NORMAL, as specified by the MigrationEvent passed to @func.
@ -81,7 +84,7 @@ typedef struct MigrationEvent {
* - MIG_EVENT_PRECOPY_FAILED * - MIG_EVENT_PRECOPY_FAILED
*/ */
void migration_add_notifier(NotifierWithReturn *notify, void migration_add_notifier(NotifierWithReturn *notify,
NotifierWithReturnFunc func); MigrationNotifyFunc func);
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);

4
migration/migration.c
View File

@ -1464,9 +1464,9 @@ static void migrate_fd_cancel(MigrationState *s)
} }
void migration_add_notifier(NotifierWithReturn *notify, void migration_add_notifier(NotifierWithReturn *notify,
NotifierWithReturnFunc func) MigrationNotifyFunc func)
{ {
notify->notify = func; notify->notify = (NotifierWithReturnFunc)func;
notifier_with_return_list_add(&migration_state_notifiers, notify); notifier_with_return_list_add(&migration_state_notifiers, notify);
} }

6
net/vhost-vdpa.c
View File

@ -323,11 +323,9 @@ static void vhost_vdpa_net_log_global_enable(VhostVDPAState *s, bool enable)
} }
static int vdpa_net_migration_state_notifier(NotifierWithReturn *notifier, static int vdpa_net_migration_state_notifier(NotifierWithReturn *notifier,
void *data, Error **errp) MigrationEvent *e, Error **errp)
{ {
MigrationEvent *e = data; VhostVDPAState *s = container_of(notifier, VhostVDPAState, migration_state);
VhostVDPAState *s = container_of(notifier, VhostVDPAState,
migration_state);
if (e->type == MIG_EVENT_PRECOPY_SETUP) { if (e->type == MIG_EVENT_PRECOPY_SETUP) {
vhost_vdpa_net_log_global_enable(s, true); vhost_vdpa_net_log_global_enable(s, true);

4
ui/spice-core.c
View File

@ -569,10 +569,8 @@ static SpiceInfo *qmp_query_spice_real(Error **errp)
} }
static int migration_state_notifier(NotifierWithReturn *notifier, static int migration_state_notifier(NotifierWithReturn *notifier,
void *data, Error **errp) MigrationEvent *e, Error **errp)
{ {
MigrationEvent *e = data;
if (!spice_have_target_host) { if (!spice_have_target_host) {
return 0; return 0;
} }