From 54d31236b906c8f03eb011717de7bc47000720c3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:59 +0200 Subject: sysemu: Split sysemu/runstate.h off sysemu/sysemu.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Markus Armbruster Message-Id: <20190812052359.30071-30-armbru@redhat.com> Reviewed-by: Alex Bennée [Unbreak OS-X build] --- hw/i386/kvm/clock.c | 2 +- hw/i386/kvm/i8254.c | 2 +- hw/i386/kvmvapic.c | 1 + hw/i386/pc.c | 1 + hw/i386/xen/xen-hvm.c | 1 + hw/i386/xen/xen-mapcache.c | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) (limited to 'hw/i386') diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index d6a5325f0b..80c133a724 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -17,8 +17,8 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/runstate.h" #include "sysemu/hw_accel.h" #include "kvm_i386.h" #include "migration/vmstate.h" diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index 27e36a2abf..6a911e23f9 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 44e40478c8..51639202c2 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -16,6 +16,7 @@ #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/kvm.h" +#include "sysemu/runstate.h" #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 14fe8233ae..3ab4bcb3ca 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -56,6 +56,7 @@ #include "sysemu/kvm.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" +#include "sysemu/runstate.h" #include "kvm_i386.h" #include "hw/xen/xen.h" #include "hw/xen/start_info.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index ca4659b20f..5d3e4750e6 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/xen-mapcache.h" #include "trace.h" diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index 09656f9f11..5b120ed44b 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -17,7 +17,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "qemu/bitmap.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "sysemu/xen-mapcache.h" #include "trace.h" -- cgit v1.2.3