summaryrefslogtreecommitdiff
path: root/target/s390x
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-08-12 07:23:59 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-08-16 13:37:36 +0200
commit54d31236b906c8f03eb011717de7bc47000720c3 (patch)
treecc3e5f84c89e946a78df8deb8bc939ae25d2ef6b /target/s390x
parent2f780b6a91fe99652266004bf78191ceddfae09c (diff)
downloadqemu-54d31236b906c8f03eb011717de7bc47000720c3.zip
sysemu: Split sysemu/runstate.h off sysemu/sysemu.h
sysemu/sysemu.h is a rather unfocused dumping ground for stuff related to the system-emulator. Evidence: * It's included widely: in my "build everything" tree, changing sysemu/sysemu.h still triggers a recompile of some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h, down from 5400 due to the previous two commits). * It pulls in more than a dozen additional headers. Split stuff related to run state management into its own header sysemu/runstate.h. Touching sysemu/sysemu.h now recompiles some 850 objects. qemu/uuid.h also drops from 1100 to 850, and qapi/qapi-types-run-state.h from 4400 to 4200. Touching new sysemu/runstate.h recompiles some 500 objects. Since I'm touching MAINTAINERS to add sysemu/runstate.h anyway, also add qemu/main-loop.h. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190812052359.30071-30-armbru@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> [Unbreak OS-X build]
Diffstat (limited to 'target/s390x')
-rw-r--r--target/s390x/helper.c2
-rw-r--r--target/s390x/kvm.c1
-rw-r--r--target/s390x/sigp.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 13ae9909ad..1350ad319a 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -26,8 +26,8 @@
#include "qemu/qemu-print.h"
#include "hw/s390x/ioinst.h"
#include "sysemu/hw_accel.h"
+#include "sysemu/runstate.h"
#ifndef CONFIG_USER_ONLY
-#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
#endif
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 55d1a14588..cea71ac7c3 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -37,6 +37,7 @@
#include "qemu/log.h"
#include "sysemu/sysemu.h"
#include "sysemu/hw_accel.h"
+#include "sysemu/runstate.h"
#include "sysemu/device_tree.h"
#include "exec/gdbstub.h"
#include "exec/ram_addr.h"
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index 8348b7035e..2ce22d4dc1 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -12,9 +12,9 @@
#include "cpu.h"
#include "internal.h"
#include "sysemu/hw_accel.h"
+#include "sysemu/runstate.h"
#include "exec/address-spaces.h"
#include "exec/exec-all.h"
-#include "sysemu/sysemu.h"
#include "sysemu/tcg.h"
#include "trace.h"
#include "qapi/qapi-types-machine.h"