diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:59 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:37:36 +0200 |
commit | 54d31236b906c8f03eb011717de7bc47000720c3 (patch) | |
tree | cc3e5f84c89e946a78df8deb8bc939ae25d2ef6b /target/i386 | |
parent | 2f780b6a91fe99652266004bf78191ceddfae09c (diff) |
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/i386')
-rw-r--r-- | target/i386/excp_helper.c | 2 | ||||
-rw-r--r-- | target/i386/hax-all.c | 2 | ||||
-rw-r--r-- | target/i386/helper.c | 2 | ||||
-rw-r--r-- | target/i386/hvf/hvf.c | 3 | ||||
-rw-r--r-- | target/i386/kvm.c | 1 | ||||
-rw-r--r-- | target/i386/sev.c | 1 | ||||
-rw-r--r-- | target/i386/whpx-all.c | 2 |
7 files changed, 8 insertions, 5 deletions
diff --git a/target/i386/excp_helper.c b/target/i386/excp_helper.c index a9bca7c28b..1447bda7a9 100644 --- a/target/i386/excp_helper.c +++ b/target/i386/excp_helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "exec/helper-proto.h" void helper_raise_interrupt(CPUX86State *env, int intno, int next_eip_addend) diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index bcacdd1d8f..a8b6e5aeb8 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -31,7 +31,7 @@ #include "hax-i386.h" #include "sysemu/accel.h" #include "sysemu/reset.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "qemu/main-loop.h" #include "hw/boards.h" diff --git a/target/i386/helper.c b/target/i386/helper.c index 23024926ac..0fa51be646 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -22,9 +22,9 @@ #include "exec/exec-all.h" #include "qemu/qemu-print.h" #include "sysemu/kvm.h" +#include "sysemu/runstate.h" #include "kvm_i386.h" #ifndef CONFIG_USER_ONLY -#include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "sysemu/hw_accel.h" #include "monitor/monitor.h" diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 6863cf2de4..231732aaf7 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -45,11 +45,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "sysemu/hvf.h" +#include "sysemu/runstate.h" #include "hvf-i386.h" #include "vmcs.h" #include "vmx.h" @@ -68,7 +70,6 @@ #include "hw/i386/apic_internal.h" #include "qemu/main-loop.h" #include "sysemu/accel.h" -#include "sysemu/sysemu.h" #include "target/i386/cpu.h" HVFState *hvf_state; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index fd55fb55e9..2abc881324 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -25,6 +25,7 @@ #include "sysemu/hw_accel.h" #include "sysemu/kvm_int.h" #include "sysemu/reset.h" +#include "sysemu/runstate.h" #include "kvm_i386.h" #include "hyperv.h" #include "hyperv-proto.h" diff --git a/target/i386/sev.c b/target/i386/sev.c index f1423cb0c0..024bb24e51 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -25,6 +25,7 @@ #include "sysemu/kvm.h" #include "sev_i386.h" #include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "trace.h" #include "migration/blocker.h" diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index b57d1c6683..0c15241ae4 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -15,8 +15,8 @@ #include "qemu-common.h" #include "sysemu/accel.h" #include "sysemu/whpx.h" -#include "sysemu/sysemu.h" #include "sysemu/cpus.h" +#include "sysemu/runstate.h" #include "qemu/main-loop.h" #include "qemu/error-report.h" #include "qapi/error.h" |