summaryrefslogtreecommitdiffstats
path: root/include/exec/memory.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/memory.h
parentc643bed99fcde661b034623722004562b7953669 (diff)
downloadhqemu-ce927ed9e40e25008453eb8f130661514b633341.zip
hqemu-ce927ed9e40e25008453eb8f130661514b633341.tar.gz
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/memory.h')
-rw-r--r--include/exec/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 3598c4f..2ddc3c5 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"
OpenPOWER on IntegriCloud