From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elslt-000660-1v for qemu-devel@nongnu.org; Wed, 14 Feb 2018 03:50:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elslp-0006Aw-6f for qemu-devel@nongnu.org; Wed, 14 Feb 2018 03:50:33 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:38572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elslo-0006AQ-Vs for qemu-devel@nongnu.org; Wed, 14 Feb 2018 03:50:29 -0500 Received: by mail-pl0-x243.google.com with SMTP id h10so1572427plt.5 for ; Wed, 14 Feb 2018 00:50:27 -0800 (PST) From: Zihan Yang Date: Wed, 14 Feb 2018 16:49:47 +0800 Message-Id: <1518598187-27169-1-git-send-email-whois.zihan.yang@gmail.com> Subject: [Qemu-devel] [PATCH] RAMList: replace QemuMutex with CompatGMutex List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Zihan Yang , Paolo Bonzini , Peter Crosthwaite , Richard Henderson change the mutex member in RAMList structure from QemuMutex to CompatGMutex. qemu_mutex_init() is just deleted instead of being replaced with g_mutex_init() because there is no need to do initialize a mutex that is statically allocated. Signed-off-by: Zihan Yang --- exec.c | 5 ++--- include/exec/ramlist.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/exec.c b/exec.c index e8d7b33..90cdd05 100644 --- a/exec.c +++ b/exec.c @@ -1423,12 +1423,12 @@ void qemu_flush_coalesced_mmio_buffer(void) void qemu_mutex_lock_ramlist(void) { - qemu_mutex_lock(&ram_list.mutex); + g_mutex_lock(&ram_list.mutex); } void qemu_mutex_unlock_ramlist(void) { - qemu_mutex_unlock(&ram_list.mutex); + g_mutex_unlock(&ram_list.mutex); } void ram_block_dump(Monitor *mon) @@ -3331,7 +3331,6 @@ void cpu_register_map_client(QEMUBH *bh) void cpu_exec_init_all(void) { - qemu_mutex_init(&ram_list.mutex); /* The data structures we set up here depend on knowing the page size, * so no more changes can be made after this point. * In an ideal world, nothing we did before we had finished the diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h index 2e2ac6c..24be5e4 100644 --- a/include/exec/ramlist.h +++ b/include/exec/ramlist.h @@ -45,7 +45,7 @@ typedef struct { } DirtyMemoryBlocks; typedef struct RAMList { - QemuMutex mutex; + CompatGMutex mutex; RAMBlock *mru_block; /* RCU-enabled, writes protected by the ramlist lock. */ QLIST_HEAD(, RAMBlock) blocks; -- 2.7.4