From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn6go-0007Gd-7B for qemu-devel@nongnu.org; Tue, 28 Apr 2015 10:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn6gj-0000sa-1y for qemu-devel@nongnu.org; Tue, 28 Apr 2015 10:40:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn6gi-0000sS-FM for qemu-devel@nongnu.org; Tue, 28 Apr 2015 10:40:40 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 1F9BF8E3CA for ; Tue, 28 Apr 2015 14:40:40 +0000 (UTC) From: Paolo Bonzini Date: Tue, 28 Apr 2015 16:40:11 +0200 Message-Id: <1430232029-9457-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1430232029-9457-1-git-send-email-pbonzini@redhat.com> References: <1430232029-9457-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/22] exec: Protect map_client_list with mutex List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng So that accesses from multiple threads are safe. Signed-off-by: Fam Zheng Message-Id: <1426496617-10702-4-git-send-email-famz@redhat.com> [Remove #if from cpu_exec_init_all. - Paolo] Signed-off-by: Paolo Bonzini --- 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