Re: [Qemu-devel] [PATCH 02/50] include: move CPU-related definitions out of qemu-common.h

["Alex Bennée" <alex.bennee@linaro.org>]

Paolo Bonzini <pbonzini@redhat.com> writes:

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  include/qemu-common.h  | 24 ------------------------
>  include/qemu/timer.h   |  1 +
>  include/qom/cpu.h      |  9 +++++++++
>  include/sysemu/cpus.h  | 13 +++++++++++++
>  stubs/cpu-get-icount.c |  1 +
>  translate-common.c     |  1 +
>  vl.c                   |  1 +
>  7 files changed, 26 insertions(+), 24 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 163bcbb..f0d74076 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -23,17 +23,6 @@
>  #include "qemu/option.h"
>  #include "qemu/host-utils.h"
>
> -void cpu_ticks_init(void);
> -
> -/* icount */
> -void configure_icount(QemuOpts *opts, Error **errp);
> -extern int use_icount;
> -extern int icount_align_option;
> -/* drift information for info jit command */
> -extern int64_t max_delay;
> -extern int64_t max_advance;
> -void dump_drift_info(FILE *f, fprintf_function cpu_fprintf);
> -
>  #include "qemu/bswap.h"
>
>  /* FIXME: Remove NEED_CPU_H.  */
> @@ -100,19 +89,6 @@ bool tcg_enabled(void);
>
>  void cpu_exec_init_all(void);
>
> -/* Unblock cpu */
> -void qemu_cpu_kick_self(void);
> -
> -/* work queue */
> -struct qemu_work_item {
> -    struct qemu_work_item *next;
> -    void (*func)(void *data);
> -    void *data;
> -    int done;
> -    bool free;
> -};
> -
> -
>  /**
>   * Sends a (part of) iovec down a socket, yielding when the socket is full, or
>   * Receives data into a (part of) iovec from a socket,
> diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> index 471969a..309f3d0 100644
> --- a/include/qemu/timer.h
> +++ b/include/qemu/timer.h
> @@ -4,6 +4,7 @@
>  #include "qemu-common.h"
>  #include "qemu/notify.h"
>  #include "qemu/host-utils.h"
> +#include "sysemu/cpus.h"
>
>  #define NANOSECONDS_PER_SECOND 1000000000LL
>
> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> index b7a10f7..ab38ce1 100644
> --- a/include/qom/cpu.h
> +++ b/include/qom/cpu.h
> @@ -222,6 +222,15 @@ struct kvm_run;
>  #define TB_JMP_CACHE_BITS 12
>  #define TB_JMP_CACHE_SIZE (1 << TB_JMP_CACHE_BITS)
>
> +/* work queue */
> +struct qemu_work_item {
> +    struct qemu_work_item *next;
> +    void (*func)(void *data);
> +    void *data;
> +    int done;
> +    bool free;
> +};
> +
>  /**
>   * CPUState:
>   * @cpu_index: CPU index (informative).
> diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
> index 3d1e5ba..fe992a8 100644
> --- a/include/sysemu/cpus.h
> +++ b/include/sysemu/cpus.h
> @@ -7,6 +7,19 @@ void qemu_init_cpu_loop(void);
>  void resume_all_vcpus(void);
>  void pause_all_vcpus(void);
>  void cpu_stop_current(void);
> +void cpu_ticks_init(void);
> +
> +void configure_icount(QemuOpts *opts, Error **errp);
> +extern int use_icount;
> +extern int icount_align_option;
> +
> +/* drift information for info jit command */
> +extern int64_t max_delay;
> +extern int64_t max_advance;
> +void dump_drift_info(FILE *f, fprintf_function cpu_fprintf);
> +
> +/* Unblock cpu */
> +void qemu_cpu_kick_self(void);
>
>  void cpu_synchronize_all_states(void);
>  void cpu_synchronize_all_post_reset(void);
> diff --git a/stubs/cpu-get-icount.c b/stubs/cpu-get-icount.c
> index 3a6f2ab..2e8b63b 100644
> --- a/stubs/cpu-get-icount.c
> +++ b/stubs/cpu-get-icount.c
> @@ -1,6 +1,7 @@
>  #include "qemu/osdep.h"
>  #include "qemu-common.h"
>  #include "qemu/timer.h"
> +#include "sysemu/cpus.h"
>
>  int use_icount;
>
> diff --git a/translate-common.c b/translate-common.c
> index ffbfe85..5e989cd 100644
> --- a/translate-common.c
> +++ b/translate-common.c
> @@ -20,6 +20,7 @@
>  #include "qemu/osdep.h"
>  #include "qemu-common.h"
>  #include "qom/cpu.h"
> +#include "sysemu/cpus.h"
>
>  uintptr_t qemu_real_host_page_size;
>  intptr_t qemu_real_host_page_mask;
> diff --git a/vl.c b/vl.c
> index 3629336..b83d275 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -87,6 +87,7 @@ int main(int argc, char **argv)
>  #include "sysemu/dma.h"
>  #include "audio/audio.h"
>  #include "migration/migration.h"
> +#include "sysemu/cpus.h"
>  #include "sysemu/kvm.h"
>  #include "qapi/qmp/qjson.h"
>  #include "qemu/option.h"


--
Alex Bennée