From patchwork Thu Jul 9 16:49:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 50980 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 07653213FD for ; Thu, 9 Jul 2015 16:49:42 +0000 (UTC) Received: by laer2 with SMTP id r2sf76244625lae.3 for ; Thu, 09 Jul 2015 09:49:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=lQWHUyXCbCPaf4W72txlIG1lrLMdx7mwMQ50bETP6g4=; b=GrGdI/6zJuABeuBVcp15zMPw2ZzvlNHY0s1Jj2atwtU2fHuWmmtkedzDexckjh9QbF cCx3HrN4/PACMIg1sfYYhgOVRSkiOXGiAP+oYVzyEBkGSjvl8842wT8JhLfCAgZzKdWK 2d+s+wLL8MLutQjMYNd1+VeBJIb1nDqAcOn68oQYTak+s3Xf+XTHrR4dXCe9TrFuE9gk MyW52KQy7hebGVePRy2A5MzML/icHtuYgZg6iDEnRViRYr6LQHTDS6ZA1hhCEOD/oLls ejzb3g1DsXanvM1Kzq8rFA+5AzQvdKvKpeaLXDaw1Lo0/qbLNwqwEeHDgMFfzX5RI5cy j/eg== X-Gm-Message-State: ALoCoQmliplAkMfKajSYPCUwO6MVnF/K2ii/J2USbRy08KcA56IARg0i0i7FAw8kSzavrnVUC8U1 X-Received: by 10.112.99.37 with SMTP id en5mr8472981lbb.7.1436460580984; Thu, 09 Jul 2015 09:49:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.202 with SMTP id d10ls1153754laa.69.gmail; Thu, 09 Jul 2015 09:49:40 -0700 (PDT) X-Received: by 10.152.28.73 with SMTP id z9mr15657578lag.93.1436460580714; Thu, 09 Jul 2015 09:49:40 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id l7si4929335lae.121.2015.07.09.09.49.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 09:49:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbpo10 with SMTP id po10so78521768lbb.3 for ; Thu, 09 Jul 2015 09:49:40 -0700 (PDT) X-Received: by 10.112.166.2 with SMTP id zc2mr15633793lbb.29.1436460580601; Thu, 09 Jul 2015 09:49:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp785020lbb; Thu, 9 Jul 2015 09:49:39 -0700 (PDT) X-Received: by 10.194.23.225 with SMTP id p1mr34167673wjf.155.1436460579830; Thu, 09 Jul 2015 09:49:39 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fx1si10105434wic.87.2015.07.09.09.49.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 Jul 2015 09:49:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZDF0z-0002vq-8F; Thu, 09 Jul 2015 17:49:37 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Crosthwaite , Stefan Weil Subject: [PATCH] tci: Fix compile failure by including qemu-common.h Date: Thu, 9 Jul 2015 17:49:37 +0100 Message-Id: <1436460577-11245-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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"