From 14a48c1d0d687735c76880e59bcede6e99871ded Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:05 +0200 Subject: qemu-common: Move tcg_enabled() etc. to sysemu/tcg.h Other accelerators have their own headers: sysemu/hax.h, sysemu/hvf.h, sysemu/kvm.h, sysemu/whpx.h. Only tcg_enabled() & friends sit in qemu-common.h. This necessitates inclusion of qemu-common.h into headers, which is against the rules spelled out in qemu-common.h's file comment. Move tcg_enabled() & friends into their own header sysemu/tcg.h, and adjust #include directives. Cc: Richard Henderson Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Message-Id: <20190523143508.25387-2-armbru@redhat.com> Reviewed-by: Richard Henderson [Rebased with conflicts resolved automatically, except for accel/tcg/tcg-all.c] --- accel/tcg/cpu-exec-common.c | 1 + accel/tcg/tcg-all.c | 2 +- accel/tcg/translate-all.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'accel/tcg') diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index 462a1f1865..12c1e3e974 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "sysemu/cpus.h" +#include "sysemu/tcg.h" #include "exec/exec-all.h" bool tcg_allowed; diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 9b215dcc5a..c92d4c82ed 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -26,8 +26,8 @@ #include "qemu/osdep.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "qom/object.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/cpus.h" #include "qemu/main-loop.h" diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index e24ee3a172..5d97a2a651 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -16,9 +16,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ + #include "qemu/osdep.h" -#include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" #include "trace.h" @@ -55,6 +55,7 @@ #include "qemu/main-loop.h" #include "exec/log.h" #include "sysemu/cpus.h" +#include "sysemu/tcg.h" /* #define DEBUG_TB_INVALIDATE */ /* #define DEBUG_TB_FLUSH */ -- cgit v1.2.3