From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60855)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1ZDGz7-0001V6-48
	for qemu-devel@nongnu.org; Thu, 09 Jul 2015 14:55:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1ZDGz3-0008VJ-Kg
	for qemu-devel@nongnu.org; Thu, 09 Jul 2015 14:55:48 -0400
Received: from mail-yk0-f179.google.com ([209.85.160.179]:35027)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.crosthwaite@petalogix.com>) id 1ZDGz3-0008Uo-3d
	for qemu-devel@nongnu.org; Thu, 09 Jul 2015 14:55:45 -0400
Received: by ykee186 with SMTP id e186so44104770yke.2
	for <qemu-devel@nongnu.org>; Thu, 09 Jul 2015 11:55:44 -0700 (PDT)
MIME-Version: 1.0
Sender: peter.crosthwaite@petalogix.com
In-Reply-To: <CAFEAcA-4c+YRzqxokWtEgvny7xJEN4nXdt-V4K0oM4uo1-+jkA@mail.gmail.com>
References: <1436460577-11245-1-git-send-email-peter.maydell@linaro.org>
	<CAFEAcA-4c+YRzqxokWtEgvny7xJEN4nXdt-V4K0oM4uo1-+jkA@mail.gmail.com>
Date: Thu, 9 Jul 2015 11:55:44 -0700
Message-ID: <CAEgOgz7_jCRWJ-Tk5iztCL-bZSBqT-oMm-uCi8211Y_9BboPrQ@mail.gmail.com>
From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] tci: Fix compile failure by including
	qemu-common.h
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Stefan Weil <sw@weilnetz.de>, Patch Tracking <patches@linaro.org>, QEMU Developers <qemu-devel@nongnu.org>, =?UTF-8?Q?Andreas_F=C3=A4rber?= <afaerber@suse.de>

On Thu, Jul 9, 2015 at 9:58 AM, Peter Maydell <peter.maydell@linaro.org> wr=
ote:
> On 9 July 2015 at 17:49, Peter Maydell <peter.maydell@linaro.org> wrote:
>> 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 =E2=80=98disassemble_=
info=E2=80=99
>>      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>
>
> Applied to master.
>

Thanks,

I'll be adding this one to my own configury for multi-arch testing.

Regards,
Peter

> Note that "make check" on a TCI seems to assert; I'll let
> somebody who cares about TCI look into that.
>
> -- PMM
>