From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDF19-0000m1-QD for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:49:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDF18-0002fq-Ke for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:49:47 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDF18-0002GQ-Cv for qemu-devel@nongnu.org; Thu, 09 Jul 2015 12:49:46 -0400 From: Peter Maydell Date: Thu, 9 Jul 2015 17:49:37 +0100 Message-Id: <1436460577-11245-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] tci: Fix compile failure by including qemu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org 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 --- The cleaner fix is to not include qemu-common.h from bfd.h, but at this point in the release cycle I want a small and safe change. --- disas/tci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/disas/tci.c b/disas/tci.c index a606b63..d7b954e 100644 --- a/disas/tci.c +++ b/disas/tci.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include "qemu-common.h" #include "disas/bfd.h" #include "tcg/tcg.h" -- 1.9.1