[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/28] cpus: Move common code out of {async_, }run_on
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/28] cpus: Move common code out of {async_, }run_on_cpu() |
Date: |
Mon, 26 Sep 2016 15:40:41 +0200 |
From: Sergey Fedorov <address@hidden>
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 <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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);
}
+static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)
+{
+ qemu_mutex_lock(&cpu->work_mutex);
+ if (cpu->queued_work_first == NULL) {
+ cpu->queued_work_first = wi;
+ } else {
+ cpu->queued_work_last->next = wi;
+ }
+ cpu->queued_work_last = wi;
+ wi->next = NULL;
+ wi->done = 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 = data;
wi.free = false;
- qemu_mutex_lock(&cpu->work_mutex);
- if (cpu->queued_work_first == NULL) {
- cpu->queued_work_first = &wi;
- } else {
- cpu->queued_work_last->next = &wi;
- }
- cpu->queued_work_last = &wi;
- wi.next = NULL;
- wi.done = 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 = current_cpu;
@@ -963,18 +968,7 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func,
void *data)
wi->data = data;
wi->free = true;
- qemu_mutex_lock(&cpu->work_mutex);
- if (cpu->queued_work_first == NULL) {
- cpu->queued_work_first = wi;
- } else {
- cpu->queued_work_last->next = wi;
- }
- cpu->queued_work_last = wi;
- wi->next = NULL;
- wi->done = false;
- qemu_mutex_unlock(&cpu->work_mutex);
-
- qemu_cpu_kick(cpu);
+ queue_work_on_cpu(cpu, wi);
}
static void qemu_kvm_destroy_vcpu(CPUState *cpu)
--
2.7.4
- [Qemu-devel] [PULL 03/28] intel_iommu: allow UNMAP notifiers, (continued)
- [Qemu-devel] [PULL 03/28] intel_iommu: allow UNMAP notifiers, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 02/28] memory: introduce IOMMUOps.notify_flag_changed, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 04/28] x86: ioapic: boost default version to 0x20, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 05/28] checkpatch: downgrade "architecture specific defines should be avoided", Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 07/28] migration: sync all address spaces, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 09/28] build-sys: put glib_cflags in QEMU_CFLAGS, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 08/28] build-sys: remove unused GLIB_CFLAGS, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 06/28] compiler: Swap 'public domain' header for license, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 10/28] cpus: pass CPUState to run_on_cpu helpers, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 12/28] cpus: Rename flush_queued_work(), Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 11/28] cpus: Move common code out of {async_, }run_on_cpu(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/28] linux-user: Use QemuMutex and QemuCond, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 14/28] linux-user: Add qemu_cpu_is_self() and qemu_cpu_kick(), Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 15/28] cpus-common: move CPU list management to common code, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 17/28] cpus-common: fix uninitialized variable use in run_on_cpu, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 16/28] cpus-common: move CPU work item management to common code, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 19/28] docs: include formal model for TCG exclusive sections, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 20/28] cpus-common: always defer async_run_on_cpu work items, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 21/28] cpus-common: remove redundant call to exclusive_idle(), Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 22/28] cpus-common: simplify locking for start_exclusive/end_exclusive, Paolo Bonzini, 2016/09/26
- [Qemu-devel] [PULL 18/28] cpus-common: move exclusive work infrastructure from linux-user, Paolo Bonzini, 2016/09/26