| Message ID | 20210304222323.1954755-3-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cpu: Move CPUClass::has_work() to TCGCPUOps | expand |
On 3/4/21 11:23 PM, Philippe Mathieu-Daudé wrote: > qemu_tcg_mttcg_enabled() shouldn't not be used outside of TCG, > restrict its declaration. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Claudio Fontana <cfontana@suse.de> > --- > include/hw/core/cpu.h | 9 --------- > include/sysemu/tcg.h | 9 +++++++++ > accel/tcg/cpu-exec.c | 1 + > tcg/tcg.c | 1 + > 4 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index e3648338dfe..1376e496a3f 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -454,15 +454,6 @@ static inline void cpu_tb_jmp_cache_clear(CPUState *cpu) > } > } > > -/** > - * qemu_tcg_mttcg_enabled: > - * Check whether we are running MultiThread TCG or not. > - * > - * Returns: %true if we are in MTTCG mode %false otherwise. > - */ > -extern bool mttcg_enabled; > -#define qemu_tcg_mttcg_enabled() (mttcg_enabled) > - > /** > * cpu_paging_enabled: > * @cpu: The CPU whose state is to be inspected. > diff --git a/include/sysemu/tcg.h b/include/sysemu/tcg.h > index fddde2b6b9a..c16c13c3c69 100644 > --- a/include/sysemu/tcg.h > +++ b/include/sysemu/tcg.h > @@ -17,6 +17,15 @@ void tcg_exec_init(unsigned long tb_size, int splitwx); > extern bool tcg_allowed; > #define tcg_enabled() (tcg_allowed) > > +/** > + * qemu_tcg_mttcg_enabled: > + * Check whether we are running MultiThread TCG or not. > + * > + * Returns: %true if we are in MTTCG mode %false otherwise. > + */ > +extern bool mttcg_enabled; > +#define qemu_tcg_mttcg_enabled() (mttcg_enabled) > + > #endif /* CONFIG_TCG */ > > #endif > diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c > index 16e4fe3ccd8..7e67ade35b9 100644 > --- a/accel/tcg/cpu-exec.c > +++ b/accel/tcg/cpu-exec.c > @@ -39,6 +39,7 @@ > #include "hw/i386/apic.h" > #endif > #include "sysemu/cpus.h" > +#include "sysemu/tcg.h" > #include "exec/cpu-all.h" > #include "sysemu/cpu-timers.h" > #include "sysemu/replay.h" > diff --git a/tcg/tcg.c b/tcg/tcg.c > index 63a12b197bf..4a4dac0bb3e 100644 > --- a/tcg/tcg.c > +++ b/tcg/tcg.c > @@ -65,6 +65,7 @@ > #include "elf.h" > #include "exec/log.h" > #include "sysemu/sysemu.h" > +#include "sysemu/tcg.h" > > /* Forward declarations for functions declared in tcg-target.c.inc and > used here. */ >
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e3648338dfe..1376e496a3f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -454,15 +454,6 @@ static inline void cpu_tb_jmp_cache_clear(CPUState *cpu) } } -/** - * qemu_tcg_mttcg_enabled: - * Check whether we are running MultiThread TCG or not. - * - * Returns: %true if we are in MTTCG mode %false otherwise. - */ -extern bool mttcg_enabled; -#define qemu_tcg_mttcg_enabled() (mttcg_enabled) - /** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected. diff --git a/include/sysemu/tcg.h b/include/sysemu/tcg.h index fddde2b6b9a..c16c13c3c69 100644 --- a/include/sysemu/tcg.h +++ b/include/sysemu/tcg.h @@ -17,6 +17,15 @@ void tcg_exec_init(unsigned long tb_size, int splitwx); extern bool tcg_allowed; #define tcg_enabled() (tcg_allowed) +/** + * qemu_tcg_mttcg_enabled: + * Check whether we are running MultiThread TCG or not. + * + * Returns: %true if we are in MTTCG mode %false otherwise. + */ +extern bool mttcg_enabled; +#define qemu_tcg_mttcg_enabled() (mttcg_enabled) + #endif /* CONFIG_TCG */ #endif diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 16e4fe3ccd8..7e67ade35b9 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -39,6 +39,7 @@ #include "hw/i386/apic.h" #endif #include "sysemu/cpus.h" +#include "sysemu/tcg.h" #include "exec/cpu-all.h" #include "sysemu/cpu-timers.h" #include "sysemu/replay.h" diff --git a/tcg/tcg.c b/tcg/tcg.c index 63a12b197bf..4a4dac0bb3e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -65,6 +65,7 @@ #include "elf.h" #include "exec/log.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" /* Forward declarations for functions declared in tcg-target.c.inc and used here. */
qemu_tcg_mttcg_enabled() shouldn't not be used outside of TCG, restrict its declaration. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/core/cpu.h | 9 --------- include/sysemu/tcg.h | 9 +++++++++ accel/tcg/cpu-exec.c | 1 + tcg/tcg.c | 1 + 4 files changed, 11 insertions(+), 9 deletions(-)