From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUdTq-0008Ao-Dt for qemu-devel@nongnu.org; Tue, 02 Aug 2016 13:27:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUdTo-0002Sf-K4 for qemu-devel@nongnu.org; Tue, 02 Aug 2016 13:27:49 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:35926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUdTo-0002SS-Cq for qemu-devel@nongnu.org; Tue, 02 Aug 2016 13:27:48 -0400 Received: by mail-wm0-x22e.google.com with SMTP id q128so418155052wma.1 for ; Tue, 02 Aug 2016 10:27:48 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 2 Aug 2016 18:27:35 +0100 Message-Id: <1470158864-17651-5-git-send-email-alex.bennee@linaro.org> In-Reply-To: <1470158864-17651-1-git-send-email-alex.bennee@linaro.org> References: <1470158864-17651-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 04/13] cpus: Wrap mutex used to protect CPU work List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org, bobby.prani@gmail.com Cc: mark.burton@greensocs.com, pbonzini@redhat.com, jan.kiszka@siemens.com, rth@twiddle.net, peter.maydell@linaro.org, claudio.fontana@huawei.com, Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Crosthwaite From: Sergey Fedorov This will be useful to enable CPU work on user mode emulation. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée --- cpus.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cpus.c b/cpus.c index 04687c8..f80ed2a 100644 --- a/cpus.c +++ b/cpus.c @@ -910,6 +910,11 @@ void qemu_init_cpu_loop(void) qemu_thread_get_self(&io_thread); } +static QemuMutex *qemu_get_cpu_work_mutex(void) +{ + return &qemu_global_mutex; +} + static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi) { qemu_mutex_lock(&cpu->work_mutex); @@ -943,7 +948,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data) while (!atomic_mb_read(&wi.done)) { CPUState *self_cpu = current_cpu; - qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex); + qemu_cond_wait(&qemu_work_cond, qemu_get_cpu_work_mutex()); current_cpu = self_cpu; } } -- 2.7.4