diff options
| author | Peter Maydell | 2019-08-16 15:53:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-08-16 15:53:43 +0200 |
| commit | 95a9457fd44ad97c518858a4e1586a5498f9773c (patch) | |
| tree | 48b3918361cd6a59208d8479a4ce5c681e499665 /migration/colo.c | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-1... (diff) | |
| parent | sysemu: Split sysemu/runstate.h off sysemu/sysemu.h (diff) | |
| download | qemu-95a9457fd44ad97c518858a4e1586a5498f9773c.tar.gz qemu-95a9457fd44ad97c518858a4e1586a5498f9773c.tar.xz qemu-95a9457fd44ad97c518858a4e1586a5498f9773c.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-include-2019-08-13-v2' into staging
Header cleanup patches for 2019-08-13
# gpg: Signature made Fri 16 Aug 2019 12:39:12 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-include-2019-08-13-v2: (29 commits)
sysemu: Split sysemu/runstate.h off sysemu/sysemu.h
sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h
Include sysemu/sysemu.h a lot less
Clean up inclusion of sysemu/sysemu.h
numa: Move remaining NUMA declarations from sysemu.h to numa.h
Include sysemu/hostmem.h less
numa: Don't include hw/boards.h into sysemu/numa.h
Include hw/boards.h a bit less
Include hw/qdev-properties.h less
Include qemu/main-loop.h less
Include qemu/queue.h slightly less
Include hw/hw.h exactly where needed
Include qom/object.h slightly less
Include exec/memory.h slightly less
Include migration/vmstate.h less
migration: Move the VMStateDescription typedef to typedefs.h
Clean up inclusion of exec/cpu-common.h
Include hw/irq.h a lot less
typedefs: Separate incomplete types and function types
ide: Include hw/ide/internal a bit less outside hw/ide/
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/colo.c')
| -rw-r--r-- | migration/colo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/migration/colo.c b/migration/colo.c index 9f84b1fa3c..2c88aa57a2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -23,6 +23,8 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" +#include "qemu/rcu.h" #include "migration/failover.h" #ifdef CONFIG_REPLICATION #include "replication.h" @@ -33,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; |