summary refs log tree commit diff stats
path: root/include/exec/cpu-defs.h
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-05-28 14:02:38 +0200
committerAndreas Färber <afaerber@suse.de>2013-06-28 13:25:13 +0200
commitce927ed9e40e25008453eb8f130661514b633341 (patch)
tree0898fa4912dba1c8aca084c35551c7b37a45b7c7 /include/exec/cpu-defs.h
parentc643bed99fcde661b034623722004562b7953669 (diff)
downloadfocaccia-qemu-ce927ed9e40e25008453eb8f130661514b633341.tar.gz
focaccia-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>
Diffstat (limited to 'include/exec/cpu-defs.h')
-rw-r--r--include/exec/cpu-defs.h2
1 files changed, 2 insertions, 0 deletions
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