diff options
| author | Peter Maydell | 2016-05-19 16:55:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-19 16:55:08 +0200 |
| commit | 776efef32439a31cb13a6acfe8aab833687745ad (patch) | |
| tree | 8bb3579b495d9c5d19145041623dc10f6e2f8d18 /target-s390x/cpu.c | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-1... (diff) | |
| parent | hw: clean up hw/hw.h includes (diff) | |
| download | qemu-776efef32439a31cb13a6acfe8aab833687745ad.tar.gz qemu-776efef32439a31cb13a6acfe8aab833687745ad.tar.xz qemu-776efef32439a31cb13a6acfe8aab833687745ad.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
NEED_CPU_H cleanups, big enough to deserve their own pull request.
# gpg: Signature made Thu 19 May 2016 15:42:37 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream: (52 commits)
hw: clean up hw/hw.h includes
hw: remove pio_addr_t
cpu: move exec-all.h inclusion out of cpu.h
exec: extract exec/tb-context.h
hw: explicitly include qemu/log.h
mips: move CP0 functions out of cpu.h
arm: move arm_log_exception into .c file
qemu-common: push cpu.h inclusion out of qemu-common.h
acpi: do not use TARGET_PAGE_SIZE
s390x: reorganize CSS bits between cpu.h and other headers
dma: do not depend on kvm_enabled()
gdbstub: remove unnecessary includes from gdbstub-xml.c
qemu-common: stop including qemu/host-utils.h from qemu-common.h
qemu-common: stop including qemu/bswap.h from qemu-common.h
cpu: move endian-dependent load/store functions to cpu-all.h
hw: cannot include hw/hw.h from user emulation
hw: move CPU state serialization to migration/cpu.h
hw: do not use VMSTATE_*TL
include: poison symbols in osdep.h
apic: move target-dependent definitions to cpu.h
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x/cpu.c')
| -rw-r--r-- | target-s390x/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 4bfff341dc..e43e2d6155 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -30,10 +30,12 @@ #include "qemu/cutils.h" #include "qemu/timer.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "trace.h" #include "qapi/visitor.h" +#include "migration/vmstate.h" +#include "exec/exec-all.h" #ifndef CONFIG_USER_ONLY +#include "hw/hw.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" |