diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-09 17:46:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-09 17:50:27 +0100 |
| commit | 16c1321bd78ad79a7252b714184ee2a0b5944c56 (patch) | |
| tree | f676c1092cfb928c69fcce18545af35ca6a7308d | |
| parent | a9dc4cf94c182f03c0061483891f53d1d21e5e68 (diff) | |
| download | qemu-16c1321bd78ad79a7252b714184ee2a0b5944c56.tar.gz qemu-16c1321bd78ad79a7252b714184ee2a0b5944c56.tar.bz2 qemu-16c1321bd78ad79a7252b714184ee2a0b5944c56.zip | |
tci: Fix compile failure by including qemu-common.h
Compilation of TCI was accidentally broken by the recent disassembler
changes:
CC x86_64-softmmu/arch_init.o
In file included from target-i386/cpu-qom.h:23:0,
from target-i386/cpu.h:986,
from include/qemu-common.h:122,
from include/disas/bfd.h:12,
from disas/tci.c:20:
include/qom/cpu.h:178:43: error: unknown type name ‘disassemble_info’
void (*disas_set_info)(CPUState *cpu, disassemble_info *info);
^
include/qom/cpu.h:179:1: error:
no semicolon at end of struct or union [-Werror]
} CPUClass;
^
cc1: all warnings being treated as errors
The underlying cause of this is an include loop:
bfd.h -> qemu-common.h -> target-arm/cpu.h -> target-arm/cpu-qom.h
-> qom/cpu.h -> bfd.h
which means that if bfd.h is included first then qom/cpu.h doesn't
get the definition of the disassemble_info type that it wanted.
The easiest fix for this is to include qemu-common.h from tci.c
before including disas/bfd.h.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | disas/tci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/disas/tci.c b/disas/tci.c index a606b63a2a..d7b954e62f 100644 --- a/disas/tci.c +++ b/disas/tci.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "qemu-common.h" #include "disas/bfd.h" #include "tcg/tcg.h" |