vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: Protect map_client_list with mutex 

So that accesses from multiple threads are safe.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1426496617-10702-4-git-send-email-famz@redhat.com>
[Remove #if from cpu_exec_init_all. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Fam Zheng 2015-03-16 17:03:35 +08:00 committed by Paolo Bonzini
parent 02f4035c47
commit 38e047b50d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exec.c
View File

@ -429,15 +429,6 @@ address_space_translate_for_iotlb(CPUState *cpu, hwaddr addr,
} }
#endif #endif
void cpu_exec_init_all(void)
{
#if !defined(CONFIG_USER_ONLY)
qemu_mutex_init(&ram_list.mutex);
memory_map_init();
io_mem_init();
#endif
}
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
static int cpu_common_post_load(void *opaque, int version_id) static int cpu_common_post_load(void *opaque, int version_id)
@ -2493,6 +2484,7 @@ typedef struct MapClient {
QLIST_ENTRY(MapClient) link; QLIST_ENTRY(MapClient) link;
} MapClient; } MapClient;
QemuMutex map_client_list_lock;
static QLIST_HEAD(map_client_list, MapClient) map_client_list static QLIST_HEAD(map_client_list, MapClient) map_client_list
= QLIST_HEAD_INITIALIZER(map_client_list); = QLIST_HEAD_INITIALIZER(map_client_list);
@ -2500,12 +2492,22 @@ void *cpu_register_map_client(void *opaque, void (*callback)(void *opaque))
{ {
MapClient *client = g_malloc(sizeof(*client)); MapClient *client = g_malloc(sizeof(*client));
qemu_mutex_lock(&map_client_list_lock);
client->opaque = opaque; client->opaque = opaque;
client->callback = callback; client->callback = callback;
QLIST_INSERT_HEAD(&map_client_list, client, link); QLIST_INSERT_HEAD(&map_client_list, client, link);
qemu_mutex_unlock(&map_client_list_lock);
return client; return client;
} }
void cpu_exec_init_all(void)
{
qemu_mutex_init(&ram_list.mutex);
memory_map_init();
io_mem_init();
qemu_mutex_init(&map_client_list_lock);
}
static void cpu_unregister_map_client(void *_client) static void cpu_unregister_map_client(void *_client)
{ {
MapClient *client = (MapClient *)_client; MapClient *client = (MapClient *)_client;
@ -2518,11 +2520,13 @@ static void cpu_notify_map_clients(void)
{ {
MapClient *client; MapClient *client;
qemu_mutex_lock(&map_client_list_lock);
while (!QLIST_EMPTY(&map_client_list)) { while (!QLIST_EMPTY(&map_client_list)) {
client = QLIST_FIRST(&map_client_list); client = QLIST_FIRST(&map_client_list);
client->callback(client->opaque); client->callback(client->opaque);
cpu_unregister_map_client(client); cpu_unregister_map_client(client);
} }
qemu_mutex_unlock(&map_client_list_lock);
} }
bool address_space_access_valid(AddressSpace *as, hwaddr addr, int len, bool is_write) bool address_space_access_valid(AddressSpace *as, hwaddr addr, int len, bool is_write)