Skip to contentSkip to conversation

Don't include sysemu/tcg.h if it is not necessary

PATCH In review Thomas Huth 3 participants 3 messages Mar 15, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Don't include sysemu/tcg.h if it is not necessary

This header only defines the tcg_allowed variable and the tcg_enabled() function - which are not required in many files that include this header. Drop the #include statement there.

---
 accel/tcg/hmp.c                  | 1 -
 accel/tcg/tcg-accel-ops-icount.c | 1 -
 bsd-user/main.c                  | 1 -
 hw/virtio/vhost.c                | 1 -
 linux-user/main.c                | 1 -
 monitor/misc.c                   | 1 -
 target/arm/helper.c              | 1 -
 target/s390x/cpu_models_sysemu.c | 1 -
 target/s390x/helper.c            | 1 -
 9 files changed, 9 deletions(-)
accel/tcg/hmp.c +0 -1
index d2ea352655..bb67941420 100644
@@ -4,7 +4,6 @@
 #include "qapi/qapi-commands-machine.h"
 #include "exec/exec-all.h"
 #include "monitor/monitor.h"
-#include "sysemu/tcg.h"
 
 static void hmp_tcg_register(void)
 {
accel/tcg/tcg-accel-ops-icount.c +0 -1
index bdaf2c943b..8827e1d2cc 100644
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/tcg.h"
 #include "sysemu/replay.h"
 #include "sysemu/cpu-timers.h"
 #include "qemu/main-loop.h"
bsd-user/main.c +0 -1
index 88d347d05e..e274dd92d7 100644
@@ -27,7 +27,6 @@
 #include "qemu-common.h"
 #include "qemu/units.h"
 #include "qemu/accel.h"
-#include "sysemu/tcg.h"
 #include "qemu-version.h"
 #include <machine/trap.h>
 
hw/virtio/vhost.c +0 -1
index b643f42ea4..c9bf01a424 100644
@@ -26,7 +26,6 @@
 #include "migration/blocker.h"
 #include "migration/qemu-file-types.h"
 #include "sysemu/dma.h"
-#include "sysemu/tcg.h"
 #include "trace.h"
 
 /* enabled until disconnected backend stabilizes */
linux-user/main.c +0 -1
index fbc9bcfd5f..f1711b82ec 100644
@@ -21,7 +21,6 @@
 #include "qemu-common.h"
 #include "qemu/units.h"
 #include "qemu/accel.h"
-#include "sysemu/tcg.h"
 #include "qemu-version.h"
 #include <sys/syscall.h>
 #include <sys/resource.h>
monitor/misc.c +0 -1
index b1839cb8ee..b5ca141e1d 100644
@@ -48,7 +48,6 @@
 #include "qapi/util.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
-#include "sysemu/tcg.h"
 #include "sysemu/tpm.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
target/arm/helper.c +0 -1
index 088956eecf..94221a3e8d 100644
@@ -27,7 +27,6 @@
 #include "sysemu/cpus.h"
 #include "sysemu/cpu-timers.h"
 #include "sysemu/kvm.h"
-#include "sysemu/tcg.h"
 #include "qemu/range.h"
 #include "qapi/qapi-commands-machine-target.h"
 #include "qapi/error.h"
target/s390x/cpu_models_sysemu.c +0 -1
index 05c3ccaaff..d8a141a023 100644
@@ -15,7 +15,6 @@
 #include "s390x-internal.h"
 #include "kvm/kvm_s390x.h"
 #include "sysemu/kvm.h"
-#include "sysemu/tcg.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi/qmp/qerror.h"
target/s390x/helper.c +0 -1
index 6e35473c7f..473c8e51b0 100644
@@ -27,7 +27,6 @@
 #include "hw/s390x/pv.h"
 #include "sysemu/hw_accel.h"
 #include "sysemu/runstate.h"
-#include "sysemu/tcg.h"
 
 void s390x_tod_timer(void *opaque)
 {
Signature · 1 line
2.27.0
#2 lore raw
In reply to Thomas Huth
Quoted 5 lines · Thomas Huth

This header only defines the tcg_allowed variable and the tcg_enabled() function - which are not required in many files that include this header. Drop the #include statement there.

Quoted 11 lines
---
  accel/tcg/hmp.c                  | 1 -
  accel/tcg/tcg-accel-ops-icount.c | 1 -
  bsd-user/main.c                  | 1 -
  hw/virtio/vhost.c                | 1 -
  linux-user/main.c                | 1 -
  monitor/misc.c                   | 1 -
  target/arm/helper.c              | 1 -
  target/s390x/cpu_models_sysemu.c | 1 -
  target/s390x/helper.c            | 1 -
  9 files changed, 9 deletions(-)

Thanks. Queued to tcg-next.

r~