[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/22] exec: Protect map_client_list with mutex
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/22] exec: Protect map_client_list with mutex |
Date: |
Tue, 28 Apr 2015 16:40:11 +0200 |
From: Fam Zheng <address@hidden>
So that accesses from multiple threads are safe.
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
[Remove #if from cpu_exec_init_all. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/exec.c b/exec.c
index 5a1c700..81666d3 100644
--- a/exec.c
+++ b/exec.c
@@ -429,15 +429,6 @@ address_space_translate_for_iotlb(CPUState *cpu, hwaddr
addr,
}
#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)
static int cpu_common_post_load(void *opaque, int version_id)
@@ -2493,6 +2484,7 @@ typedef struct MapClient {
QLIST_ENTRY(MapClient) link;
} MapClient;
+QemuMutex map_client_list_lock;
static QLIST_HEAD(map_client_list, MapClient) 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));
+ qemu_mutex_lock(&map_client_list_lock);
client->opaque = opaque;
client->callback = callback;
QLIST_INSERT_HEAD(&map_client_list, client, link);
+ qemu_mutex_unlock(&map_client_list_lock);
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)
{
MapClient *client = (MapClient *)_client;
@@ -2518,11 +2520,13 @@ static void cpu_notify_map_clients(void)
{
MapClient *client;
+ qemu_mutex_lock(&map_client_list_lock);
while (!QLIST_EMPTY(&map_client_list)) {
client = QLIST_FIRST(&map_client_list);
client->callback(client->opaque);
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)
--
2.3.5
- [Qemu-devel] [PULL 00/22] Memory, TCG, NBD, build system changes for 2015-04-27, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 01/22] translate-all: use glib for all page descriptor allocations, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 02/22] exec: Atomic access to bounce buffer, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 04/22] exec: Protect map_client_list with mutex,
Paolo Bonzini <=
- [Qemu-devel] [PULL 03/22] linux-user, bsd-user: Remove two calls to cpu_exec_init_all, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 05/22] exec: Notify cpu_register_map_client caller if the bounce buffer is available, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 06/22] dma-helpers: Fix race condition of continue_after_map_failure and dma_aio_cancel, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 07/22] memory: add memory_region_ram_resize, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 08/22] acpi-build: remove dependency from ram_addr.h, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 09/22] sun4m: fix slavio sysctrl and led register sizes, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 10/22] sb16: remove useless mixer_write_indexw, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 11/22] gus: clean up MemoryRegionPortio, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 12/22] ide: there is only one data port, Paolo Bonzini, 2015/04/28
- [Qemu-devel] [PULL 13/22] ioport: remove wrong comment, Paolo Bonzini, 2015/04/28