aboutsummaryrefslogtreecommitdiff
path: root/replay
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-08-16 14:53:43 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-08-16 14:53:43 +0100
commit95a9457fd44ad97c518858a4e1586a5498f9773c (patch)
tree48b3918361cd6a59208d8479a4ce5c681e499665 /replay
parent1f3a51f3feabb5235c073a9ec9211156a519d058 (diff)
parent54d31236b906c8f03eb011717de7bc47000720c3 (diff)
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 'replay')
-rw-r--r--replay/replay-audio.c1
-rw-r--r--replay/replay-char.c1
-rw-r--r--replay/replay-internal.c3
-rw-r--r--replay/replay-net.c1
-rw-r--r--replay/replay-snapshot.c1
-rw-r--r--replay/replay.c2
6 files changed, 3 insertions, 6 deletions
diff --git a/replay/replay-audio.c b/replay/replay-audio.c
index b113836de4..178094e601 100644
--- a/replay/replay-audio.c
+++ b/replay/replay-audio.c
@@ -13,7 +13,6 @@
#include "qemu/error-report.h"
#include "sysemu/replay.h"
#include "replay-internal.h"
-#include "sysemu/sysemu.h"
#include "audio/audio.h"
void replay_audio_out(int *played)
diff --git a/replay/replay-char.c b/replay/replay-char.c
index 736cc8c2e6..dc0002367e 100644
--- a/replay/replay-char.c
+++ b/replay/replay-char.c
@@ -13,7 +13,6 @@
#include "qemu/error-report.h"
#include "sysemu/replay.h"
#include "replay-internal.h"
-#include "sysemu/sysemu.h"
#include "chardev/char.h"
/* Char drivers that generate qemu_chr_be_write events
diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index 9e41ed1dcf..c013b23820 100644
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -11,9 +11,10 @@
#include "qemu/osdep.h"
#include "sysemu/replay.h"
+#include "sysemu/runstate.h"
#include "replay-internal.h"
#include "qemu/error-report.h"
-#include "sysemu/sysemu.h"
+#include "qemu/main-loop.h"
/* Mutex to protect reading and writing events to the log.
data_kind and has_unread_data are also protected
diff --git a/replay/replay-net.c b/replay/replay-net.c
index 80b7054156..3b70f71cf1 100644
--- a/replay/replay-net.c
+++ b/replay/replay-net.c
@@ -13,7 +13,6 @@
#include "qemu/error-report.h"
#include "sysemu/replay.h"
#include "replay-internal.h"
-#include "sysemu/sysemu.h"
#include "net/net.h"
#include "net/filter.h"
#include "qemu/iov.h"
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index 756f48bc02..5dd8680480 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -13,7 +13,6 @@
#include "qapi/error.h"
#include "sysemu/replay.h"
#include "replay-internal.h"
-#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h"
diff --git a/replay/replay.c b/replay/replay.c
index 8b172b2d1b..0c4e9c1318 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -12,12 +12,12 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "sysemu/replay.h"
+#include "sysemu/runstate.h"
#include "replay-internal.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
#include "sysemu/cpus.h"
-#include "sysemu/sysemu.h"
#include "qemu/error-report.h"
/* Current version of the replay mechanism.