| Message ID | 20190130004811.27372-6-cota@braap.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | per-CPU locks | expand |
Emilio G. Cota <cota@braap.org> writes: > We don't pass a pointer to qemu_global_mutex anymore. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Emilio G. Cota <cota@braap.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/qom/cpu.h | 10 ---------- > cpus-common.c | 2 +- > cpus.c | 5 ----- > 3 files changed, 1 insertion(+), 16 deletions(-) > > diff --git a/include/qom/cpu.h b/include/qom/cpu.h > index 46e3c164aa..fe389037c5 100644 > --- a/include/qom/cpu.h > +++ b/include/qom/cpu.h > @@ -768,16 +768,6 @@ void qemu_cpu_kick(CPUState *cpu); > */ > bool cpu_is_stopped(CPUState *cpu); > > -/** > - * do_run_on_cpu: > - * @cpu: The vCPU to run on. > - * @func: The function to be executed. > - * @data: Data to pass to the function. > - * > - * Used internally in the implementation of run_on_cpu. > - */ > -void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data); > - > /** > * run_on_cpu: > * @cpu: The vCPU to run on. > diff --git a/cpus-common.c b/cpus-common.c > index daf1531868..85a61eb970 100644 > --- a/cpus-common.c > +++ b/cpus-common.c > @@ -127,7 +127,7 @@ static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi) > cpu_mutex_unlock(cpu); > } > > -void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) > +void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) > { > struct qemu_work_item wi; > bool has_bql = qemu_mutex_iothread_locked(); > diff --git a/cpus.c b/cpus.c > index 42ea8cfbb5..755e4addab 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -1234,11 +1234,6 @@ void qemu_init_cpu_loop(void) > qemu_thread_get_self(&io_thread); > } > > -void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) > -{ > - do_run_on_cpu(cpu, func, data); > -} > - > static void qemu_kvm_destroy_vcpu(CPUState *cpu) > { > if (kvm_destroy_vcpu(cpu) < 0) { -- Alex Bennée
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 46e3c164aa..fe389037c5 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -768,16 +768,6 @@ void qemu_cpu_kick(CPUState *cpu); */ bool cpu_is_stopped(CPUState *cpu); -/** - * do_run_on_cpu: - * @cpu: The vCPU to run on. - * @func: The function to be executed. - * @data: Data to pass to the function. - * - * Used internally in the implementation of run_on_cpu. - */ -void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data); - /** * run_on_cpu: * @cpu: The vCPU to run on. diff --git a/cpus-common.c b/cpus-common.c index daf1531868..85a61eb970 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -127,7 +127,7 @@ static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi) cpu_mutex_unlock(cpu); } -void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) +void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) { struct qemu_work_item wi; bool has_bql = qemu_mutex_iothread_locked(); diff --git a/cpus.c b/cpus.c index 42ea8cfbb5..755e4addab 100644 --- a/cpus.c +++ b/cpus.c @@ -1234,11 +1234,6 @@ void qemu_init_cpu_loop(void) qemu_thread_get_self(&io_thread); } -void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) -{ - do_run_on_cpu(cpu, func, data); -} - static void qemu_kvm_destroy_vcpu(CPUState *cpu) { if (kvm_destroy_vcpu(cpu) < 0) {