aboutsummaryrefslogtreecommitdiff
path: root/accel
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-05-23 16:35:05 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-06-11 20:22:09 +0200
commit14a48c1d0d687735c76880e59bcede6e99871ded (patch)
tree83b165e699adbf64297972d9dc8f5aa3dabdf867 /accel
parenta578cdfbdd8f9beff5ced52b7826ddb1669abbbf (diff)
downloadqemu-14a48c1d0d687735c76880e59bcede6e99871ded.zip
qemu-14a48c1d0d687735c76880e59bcede6e99871ded.tar.gz
qemu-14a48c1d0d687735c76880e59bcede6e99871ded.tar.bz2
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 <rth@twiddle.net> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190523143508.25387-2-armbru@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> [Rebased with conflicts resolved automatically, except for accel/tcg/tcg-all.c]
Diffstat (limited to 'accel')
-rw-r--r--accel/tcg/cpu-exec-common.c1
-rw-r--r--accel/tcg/tcg-all.c2
-rw-r--r--accel/tcg/translate-all.c3
3 files changed, 4 insertions, 2 deletions
diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
index 462a1f1..12c1e3e 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 9b215dc..c92d4c8 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 e24ee3a..5d97a2a 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 <http://www.gnu.org/licenses/>.
*/
+
#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 */