Re: [PATCH v2 1/9] cpus: Export queue work related fields to cpu.h

[David Hildenbrand]

On 23.07.21 21:34, Peter Xu wrote:
> This patch has no functional change, but prepares for moving the function
> do_run_on_cpu() into softmmu/cpus.c.  It does:
>
>    1. Move qemu_work_item into hw/core/cpu.h.
>    2. Export queue_work_on_cpu()/qemu_work_cond.
>
> All of them will be used by softmmu/cpus.c later.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>   cpus-common.c         | 11 ++---------
>   include/hw/core/cpu.h | 10 +++++++++-
>   2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/cpus-common.c b/cpus-common.c
> index 6e73d3e58d..d814b2439a 100644
> --- a/cpus-common.c
> +++ b/cpus-common.c
> @@ -27,7 +27,7 @@
>   static QemuMutex qemu_cpu_list_lock;
>   static QemuCond exclusive_cond;
>   static QemuCond exclusive_resume;
> -static QemuCond qemu_work_cond;
> +QemuCond qemu_work_cond;
>   
>   /* >= 1 if a thread is inside start_exclusive/end_exclusive.  Written
>    * under qemu_cpu_list_lock, read with atomic operations.
> @@ -114,14 +114,7 @@ CPUState *qemu_get_cpu(int index)
>   /* current CPU in the current thread. It is only valid inside cpu_exec() */
>   __thread CPUState *current_cpu;
>   
> -struct qemu_work_item {
> -    QSIMPLEQ_ENTRY(qemu_work_item) node;
> -    run_on_cpu_func func;
> -    run_on_cpu_data data;
> -    bool free, exclusive, done;
> -};
> -
> -static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)
> +void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)
>   {
>       qemu_mutex_lock(&cpu->work_mutex);
>       QSIMPLEQ_INSERT_TAIL(&cpu->work_list, wi, node);
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index bc864564ce..f62ae88524 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -243,7 +243,15 @@ typedef union {
>   
>   typedef void (*run_on_cpu_func)(CPUState *cpu, run_on_cpu_data data);
>   
> -struct qemu_work_item;
> +struct qemu_work_item {
> +    QSIMPLEQ_ENTRY(qemu_work_item) node;
> +    run_on_cpu_func func;
> +    run_on_cpu_data data;
> +    bool free, exclusive, done;
> +};
> +
> +void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi);
> +extern QemuCond qemu_work_cond;
>   
>   #define CPU_UNSET_NUMA_NODE_ID -1
>   #define CPU_TRACE_DSTATE_MAX_EVENTS 32

Reviewed-by: David Hildenbrand <david@redhat.com>

--
Thanks,

David / dhildenb