From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bly2U-0001u5-TH for qemu-devel@nongnu.org; Mon, 19 Sep 2016 08:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bly2N-00014Y-2n for qemu-devel@nongnu.org; Mon, 19 Sep 2016 08:51:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bly2M-00014Q-SQ for qemu-devel@nongnu.org; Mon, 19 Sep 2016 08:51:06 -0400 From: Paolo Bonzini Date: Mon, 19 Sep 2016 14:50:45 +0200 Message-Id: <1474289459-15242-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1474289459-15242-1-git-send-email-pbonzini@redhat.com> References: <1474289459-15242-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 02/16] cpus: Move common code out of {async_, }run_on_cpu() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: sergey.fedorov@linaro.org, serge.fdrv@gmail.com, alex.bennee@linaro.org From: Sergey Fedorov Move the code common between run_on_cpu() and async_run_on_cpu() into a new function queue_work_on_cpu(). Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <1470158864-17651-4-git-send-email-alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini --- cpus.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/cpus.c b/cpus.c index 1a2a9b0..ed7d30a 100644 --- a/cpus.c +++ b/cpus.c @@ -916,6 +916,22 @@ void qemu_init_cpu_loop(void) qemu_thread_get_self(&io_thread); } =20 +static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi) +{ + qemu_mutex_lock(&cpu->work_mutex); + if (cpu->queued_work_first =3D=3D NULL) { + cpu->queued_work_first =3D wi; + } else { + cpu->queued_work_last->next =3D wi; + } + cpu->queued_work_last =3D wi; + wi->next =3D NULL; + wi->done =3D false; + qemu_mutex_unlock(&cpu->work_mutex); + + qemu_cpu_kick(cpu); +} + void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data) { struct qemu_work_item wi; @@ -929,18 +945,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func,= void *data) wi.data =3D data; wi.free =3D false; =20 - qemu_mutex_lock(&cpu->work_mutex); - if (cpu->queued_work_first =3D=3D NULL) { - cpu->queued_work_first =3D &wi; - } else { - cpu->queued_work_last->next =3D &wi; - } - cpu->queued_work_last =3D &wi; - wi.next =3D NULL; - wi.done =3D false; - qemu_mutex_unlock(&cpu->work_mutex); - - qemu_cpu_kick(cpu); + queue_work_on_cpu(cpu, &wi); while (!atomic_mb_read(&wi.done)) { CPUState *self_cpu =3D current_cpu; =20 @@ -963,18 +968,7 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func= func, void *data) wi->data =3D data; wi->free =3D true; =20 - qemu_mutex_lock(&cpu->work_mutex); - if (cpu->queued_work_first =3D=3D NULL) { - cpu->queued_work_first =3D wi; - } else { - cpu->queued_work_last->next =3D wi; - } - cpu->queued_work_last =3D wi; - wi->next =3D NULL; - wi->done =3D false; - qemu_mutex_unlock(&cpu->work_mutex); - - qemu_cpu_kick(cpu); + queue_work_on_cpu(cpu, wi); } =20 static void qemu_kvm_destroy_vcpu(CPUState *cpu) --=20 2.7.4