From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cH4TQ-0008RP-U8 for qemu-devel@nongnu.org; Wed, 14 Dec 2016 02:59:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cH4TN-00026E-T8 for qemu-devel@nongnu.org; Wed, 14 Dec 2016 02:59:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cH4TN-000266-LI for qemu-devel@nongnu.org; Wed, 14 Dec 2016 02:59:33 -0500 References: <1481285870-3396-1-git-send-email-thuth@redhat.com> <1481285870-3396-6-git-send-email-thuth@redhat.com> <192aeaa3-042c-6e37-80b3-7a21453c542f@redhat.com> From: Thomas Huth Message-ID: <604aea80-b160-8cc8-c4e5-231669ca7443@redhat.com> Date: Wed, 14 Dec 2016 08:59:24 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 05/20] arm: Move CPU files to target/ folder List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier , Peter Maydell Cc: QEMU Developers , Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Aurelien Jarno , "Edgar E. Iglesias" , Michael Walle , Yongbok Kim , Anthony Green , Jia Liu , David Gibson , Alexander Graf , Mark Cave-Ayland , Artyom Tarasenko , Guan Xuetao , Eduardo Habkost , Max Filippov , Bastian Koppelmann , James Hogan , Christian Borntraeger , Cornelia Huck , Marcelo Tosatti On 14.12.2016 08:56, Laurent Vivier wrote: > Le 14/12/2016 =C3=A0 08:43, Thomas Huth a =C3=A9crit : >> On 13.12.2016 19:19, Peter Maydell wrote: >>> On 9 December 2016 at 12:17, Thomas Huth wrote: >>>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c >>>> index d4160df..60770d4 100644 >>>> --- a/hw/arm/virt-acpi-build.c >>>> +++ b/hw/arm/virt-acpi-build.c >>>> @@ -33,7 +33,7 @@ >>>> #include "qemu/bitmap.h" >>>> #include "trace.h" >>>> #include "qom/cpu.h" >>>> -#include "target-arm/cpu.h" >>>> +#include "cpu.h" >>>> #include "hw/acpi/acpi-defs.h" >>>> #include "hw/acpi/acpi.h" >>>> #include "hw/nvram/fw_cfg.h" >>> >>> Something looks wrong here. We definitely want the ARM >>> version of cpu.h, not any random cpu.h. The #include >>> filename should make it clear which file we're getting, >>> both so it's easier for humans to understand and so that >>> one day we might be able to build more than one target >>> CPU into the same QEMU binary. >> >> Right, good catch, thanks! Looks like I did it right in the other >> patches and used target/ppc/cpu.h there for example ... I'll fix it fo= r >> ARM in the next version of the patch... >=20 > There is the same problem in: m68k, alpha, mips and sh4. >=20 > Could you fix them too? You mean the #inlcude "cpu-qom.h" statements? I think they are less critical since there is no cpu-qom.h in the generic include folder ... but yes, better safe than sorry, I'll fix these statements, too. Thomas