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 /include/hw | |
| parent | 1e00b8d57a16b9855ae49c2b0fe897e4ec7142d4 (diff) | |
| download | focaccia-qemu-741da0d38b40b143724de320f4ed599402eece07.tar.gz focaccia-qemu-741da0d38b40b143724de320f4ed599402eece07.zip | |
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 'include/hw')
| -rw-r--r-- | include/hw/hw.h | 5 | ||||
| -rw-r--r-- | include/hw/ppc/openpic.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/hw.h b/include/hw/hw.h index 0456fc3495..29931d1e43 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -3,10 +3,11 @@ #define QEMU_HW_H -#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H) -#include "exec/cpu-common.h" +#ifdef CONFIG_USER_ONLY +#error Cannot include hw/hw.h from user emulation #endif +#include "exec/cpu-common.h" #include "exec/ioport.h" #include "hw/irq.h" #include "block/aio.h" diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 1cf188d81c..afe950b409 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -2,7 +2,7 @@ #define __OPENPIC_H__ #include "qemu-common.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qom/cpu.h" #define TYPE_OPENPIC "openpic" |