diff options
| author | Markus Armbruster | 2019-08-12 07:23:59 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2019-08-16 13:37:36 +0200 |
| commit | 54d31236b906c8f03eb011717de7bc47000720c3 (patch) | |
| tree | cc3e5f84c89e946a78df8deb8bc939ae25d2ef6b /migration | |
| parent | sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h (diff) | |
| download | qemu-54d31236b906c8f03eb011717de7bc47000720c3.tar.gz qemu-54d31236b906c8f03eb011717de7bc47000720c3.tar.xz qemu-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 'migration')
| -rw-r--r-- | migration/block-dirty-bitmap.c | 2 | ||||
| -rw-r--r-- | migration/colo.c | 1 | ||||
| -rw-r--r-- | migration/global_state.c | 2 | ||||
| -rw-r--r-- | migration/migration.c | 1 | ||||
| -rw-r--r-- | migration/savevm.c | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 4a896a09eb..a09a893c02 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -62,6 +62,7 @@ #include "block/block.h" #include "block/block_int.h" #include "sysemu/block-backend.h" +#include "sysemu/runstate.h" #include "qemu/main-loop.h" #include "qemu/error-report.h" #include "migration/misc.h" @@ -70,7 +71,6 @@ #include "migration/vmstate.h" #include "migration/register.h" #include "qemu/hbitmap.h" -#include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qapi/error.h" #include "trace.h" diff --git a/migration/colo.c b/migration/colo.c index 0602e6bbe4..2c88aa57a2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -35,6 +35,7 @@ #include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" #include "sysemu/cpus.h" +#include "sysemu/runstate.h" #include "net/filter.h" static bool vmstate_loading; diff --git a/migration/global_state.c b/migration/global_state.c index 7cba868979..25311479a4 100644 --- a/migration/global_state.c +++ b/migration/global_state.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/error-report.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "qapi/error.h" #include "migration.h" #include "migration/global_state.h" diff --git a/migration/migration.c b/migration/migration.c index 2986b8b164..c1600c395f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -21,6 +21,7 @@ #include "exec.h" #include "fd.h" #include "socket.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "rdma.h" #include "ram.h" diff --git a/migration/savevm.c b/migration/savevm.c index 33da39f0ea..fd3c39dc39 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -57,6 +57,7 @@ #include "io/channel-buffer.h" #include "io/channel-file.h" #include "sysemu/replay.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "qjson.h" #include "migration/colo.h" |