diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2010-04-01 19:57:10 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-09 18:55:55 +0200 |
| commit | 37b76cfd938dafc89dc609cfb2c84719357867a5 (patch) | |
| tree | c99b2131b9a2312ebbd065734489c89f9159bffb | |
| parent | fbe3288df645b3b81850008327e3b714a5ca7036 (diff) | |
| download | qemu-37b76cfd938dafc89dc609cfb2c84719357867a5.tar.gz | |
move targphys.h and hw/poison.h inclusion to cpu-common.h
With more files from outside the hw/ directory being placed into
libhw, avoid the need to include hw/hw.h for the sake of targ_phys_addr_t.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | cpu-common.h | 8 | ||||
| -rw-r--r-- | hw/hw.h | 2 | ||||
| -rw-r--r-- | poison.h (renamed from hw/poison.h) | 0 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cpu-common.h b/cpu-common.h index ce0221b197..b730ca033d 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -7,6 +7,14 @@ #define WORDS_ALIGNED #endif +#ifdef TARGET_PHYS_ADDR_BITS +#include "targphys.h" +#endif + +#ifndef NEED_CPU_H +#include "poison.h" +#endif + #include "bswap.h" #include "qemu-queue.h" @@ -5,8 +5,6 @@ #include "qemu-common.h" #if defined(TARGET_PHYS_ADDR_BITS) && !defined(NEED_CPU_H) -#include "targphys.h" -#include "poison.h" #include "cpu-common.h" #endif diff --git a/hw/poison.h b/poison.h index d7db7f43b6..d7db7f43b6 100644 --- a/hw/poison.h +++ b/poison.h |