diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-28 14:02:38 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-28 13:25:13 +0200 |
| commit | ce927ed9e40e25008453eb8f130661514b633341 (patch) | |
| tree | 0898fa4912dba1c8aca084c35551c7b37a45b7c7 | |
| parent | c643bed99fcde661b034623722004562b7953669 (diff) | |
| download | qemu-ce927ed9e40e25008453eb8f130661514b633341.zip | |
hwaddr: Make hwaddr type usable beyond softmmu
While not normally needed for *-user, it can safely be used there since
always based on uint64_t, to avoid ifdeffery.
To avoid accidental uses, move the guards from exec/hwaddr.h to its
inclusion sites. No need for them in include/hw/.
Prepares for hwaddr use in qom/cpu.h.
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | include/exec/cpu-common.h | 2 | ||||
| -rw-r--r-- | include/exec/cpu-defs.h | 2 | ||||
| -rw-r--r-- | include/exec/hwaddr.h | 4 | ||||
| -rw-r--r-- | include/exec/memory.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 92a422313f..5240ae2ac2 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -3,7 +3,9 @@ /* CPU interfaces that are target independent. */ +#ifndef CONFIG_USER_ONLY #include "exec/hwaddr.h" +#endif #ifndef NEED_CPU_H #include "exec/poison.h" diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 2e5a9bab3c..c4ac929875 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -28,7 +28,9 @@ #include <inttypes.h> #include "qemu/osdep.h" #include "qemu/queue.h" +#ifndef CONFIG_USER_ONLY #include "exec/hwaddr.h" +#endif #ifndef TARGET_LONG_BITS #error TARGET_LONG_BITS must be defined before including this header diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h index 251cf9216f..c9eb78fba1 100644 --- a/include/exec/hwaddr.h +++ b/include/exec/hwaddr.h @@ -3,8 +3,6 @@ #ifndef HWADDR_H #define HWADDR_H -#ifndef CONFIG_USER_ONLY - #define HWADDR_BITS 64 /* hwaddr is the type of a physical address (its size can be different from 'target_ulong'). */ @@ -20,5 +18,3 @@ typedef uint64_t hwaddr; #define HWADDR_PRIX PRIX64 #endif - -#endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 3598c4f914..2ddc3c5393 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -20,7 +20,9 @@ #include <stdbool.h> #include "qemu-common.h" #include "exec/cpu-common.h" +#ifndef CONFIG_USER_ONLY #include "exec/hwaddr.h" +#endif #include "qemu/queue.h" #include "exec/iorange.h" #include "exec/ioport.h" |