diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-27 08:40:04 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-19 16:42:28 +0200 |
| commit | 741da0d38b40b143724de320f4ed599402eece07 (patch) | |
| tree | 4620cc4fd5f18d951b71069e2ae5d3207a479cfb /target-s390x | |
| parent | 1e00b8d57a16b9855ae49c2b0fe897e4ec7142d4 (diff) | |
hw: cannot include hw/hw.h from user emulation
All qdev definitions are available from other headers, user-mode
emulation does not need hw/hw.h.
By considering system emulation only, it is simpler to disentangle
hw/hw.h from NEED_CPU_H.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.c | 3 | ||||
| -rw-r--r-- | target-s390x/mem_helper.c | 3 | ||||
| -rw-r--r-- | target-s390x/misc_helper.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 4bfff341dc..e6651654f3 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -30,10 +30,11 @@ #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" #ifndef CONFIG_USER_ONLY +#include "hw/hw.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 7078622030..9d206a92cf 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -22,7 +22,10 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" + +#if !defined(CONFIG_USER_ONLY) #include "hw/s390x/storage-keys.h" +#endif /*****************************************************************************/ /* Softmmu support */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 462cfc85fc..93280d0269 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -30,9 +30,9 @@ #include <linux/kvm.h> #endif #include "exec/cpu_ldst.h" -#include "hw/watchdog/wdt_diag288.h" #if !defined(CONFIG_USER_ONLY) +#include "hw/watchdog/wdt_diag288.h" #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "hw/s390x/ebcdic.h" |