From ce927ed9e40e25008453eb8f130661514b633341 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Tue, 28 May 2013 14:02:38 +0200 Subject: 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 --- include/exec/memory.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/exec/memory.h') 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 #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" -- cgit v1.2.3-55-g7522