Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
migration/multifd: Rename threadinfo.c functions
We're about to add more functions to this file so make it use the same
coding style as the rest of the code.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20230607161306.31425-2-farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
  • Loading branch information
Fabiano Rosas authored and Juan Quintela committed Jun 22, 2023
1 parent 67fe6ae commit 7776187
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions migration/migration.c
Expand Up @@ -2922,7 +2922,7 @@ static void *migration_thread(void *opaque)
MigThrError thr_error;
bool urgent = false;

thread = MigrationThreadAdd("live_migration", qemu_get_thread_id());
thread = migration_threads_add("live_migration", qemu_get_thread_id());

rcu_register_thread();

Expand Down Expand Up @@ -3000,7 +3000,7 @@ static void *migration_thread(void *opaque)
migration_iteration_finish(s);
object_unref(OBJECT(s));
rcu_unregister_thread();
MigrationThreadDel(thread);
migration_threads_remove(thread);
return NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions migration/multifd.c
Expand Up @@ -651,7 +651,7 @@ static void *multifd_send_thread(void *opaque)
int ret = 0;
bool use_zero_copy_send = migrate_zero_copy_send();

thread = MigrationThreadAdd(p->name, qemu_get_thread_id());
thread = migration_threads_add(p->name, qemu_get_thread_id());

trace_multifd_send_thread_start(p->id);
rcu_register_thread();
Expand Down Expand Up @@ -767,7 +767,7 @@ static void *multifd_send_thread(void *opaque)
qemu_mutex_unlock(&p->mutex);

rcu_unregister_thread();
MigrationThreadDel(thread);
migration_threads_remove(thread);
trace_multifd_send_thread_end(p->id, p->num_packets, p->total_normal_pages);

return NULL;
Expand Down
4 changes: 2 additions & 2 deletions migration/threadinfo.c
Expand Up @@ -14,7 +14,7 @@

static QLIST_HEAD(, MigrationThread) migration_threads;

MigrationThread *MigrationThreadAdd(const char *name, int thread_id)
MigrationThread *migration_threads_add(const char *name, int thread_id)
{
MigrationThread *thread = g_new0(MigrationThread, 1);
thread->name = name;
Expand All @@ -25,7 +25,7 @@ MigrationThread *MigrationThreadAdd(const char *name, int thread_id)
return thread;
}

void MigrationThreadDel(MigrationThread *thread)
void migration_threads_remove(MigrationThread *thread)
{
if (thread) {
QLIST_REMOVE(thread, node);
Expand Down
5 changes: 2 additions & 3 deletions migration/threadinfo.h
Expand Up @@ -23,6 +23,5 @@ struct MigrationThread {
QLIST_ENTRY(MigrationThread) node;
};

MigrationThread *MigrationThreadAdd(const char *name, int thread_id);

void MigrationThreadDel(MigrationThread *info);
MigrationThread *migration_threads_add(const char *name, int thread_id);
void migration_threads_remove(MigrationThread *info);

0 comments on commit 7776187

Please sign in to comment.