|
@@ -10,23 +10,35 @@
|
|
* See the COPYING file in the top-level directory.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
+#include "qemu/osdep.h"
|
|
|
|
+#include "qemu/queue.h"
|
|
|
|
+#include "qemu/lockable.h"
|
|
#include "threadinfo.h"
|
|
#include "threadinfo.h"
|
|
|
|
|
|
|
|
+QemuMutex migration_threads_lock;
|
|
static QLIST_HEAD(, MigrationThread) migration_threads;
|
|
static QLIST_HEAD(, MigrationThread) migration_threads;
|
|
|
|
|
|
|
|
+static void __attribute__((constructor)) migration_threads_init(void)
|
|
|
|
+{
|
|
|
|
+ qemu_mutex_init(&migration_threads_lock);
|
|
|
|
+}
|
|
|
|
+
|
|
MigrationThread *migration_threads_add(const char *name, int thread_id)
|
|
MigrationThread *migration_threads_add(const char *name, int thread_id)
|
|
{
|
|
{
|
|
MigrationThread *thread = g_new0(MigrationThread, 1);
|
|
MigrationThread *thread = g_new0(MigrationThread, 1);
|
|
thread->name = name;
|
|
thread->name = name;
|
|
thread->thread_id = thread_id;
|
|
thread->thread_id = thread_id;
|
|
|
|
|
|
- QLIST_INSERT_HEAD(&migration_threads, thread, node);
|
|
|
|
|
|
+ WITH_QEMU_LOCK_GUARD(&migration_threads_lock) {
|
|
|
|
+ QLIST_INSERT_HEAD(&migration_threads, thread, node);
|
|
|
|
+ }
|
|
|
|
|
|
return thread;
|
|
return thread;
|
|
}
|
|
}
|
|
|
|
|
|
void migration_threads_remove(MigrationThread *thread)
|
|
void migration_threads_remove(MigrationThread *thread)
|
|
{
|
|
{
|
|
|
|
+ QEMU_LOCK_GUARD(&migration_threads_lock);
|
|
if (thread) {
|
|
if (thread) {
|
|
QLIST_REMOVE(thread, node);
|
|
QLIST_REMOVE(thread, node);
|
|
g_free(thread);
|
|
g_free(thread);
|
|
@@ -39,6 +51,7 @@ MigrationThreadInfoList *qmp_query_migrationthreads(Error **errp)
|
|
MigrationThreadInfoList **tail = &head;
|
|
MigrationThreadInfoList **tail = &head;
|
|
MigrationThread *thread = NULL;
|
|
MigrationThread *thread = NULL;
|
|
|
|
|
|
|
|
+ QEMU_LOCK_GUARD(&migration_threads_lock);
|
|
QLIST_FOREACH(thread, &migration_threads, node) {
|
|
QLIST_FOREACH(thread, &migration_threads, node) {
|
|
MigrationThreadInfo *info = g_new0(MigrationThreadInfo, 1);
|
|
MigrationThreadInfo *info = g_new0(MigrationThreadInfo, 1);
|
|
info->name = g_strdup(thread->name);
|
|
info->name = g_strdup(thread->name);
|