From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.4 required=3.0 tests=FROM_EXCESS_BASE64, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93106C46470 for ; Thu, 23 May 2019 11:41:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65DB620851 for ; Thu, 23 May 2019 11:41:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65DB620851 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:34145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTm61-00076P-Gz for qemu-devel@archiver.kernel.org; Thu, 23 May 2019 07:41:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTm3F-0004ug-N0 for qemu-devel@nongnu.org; Thu, 23 May 2019 07:38:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTlpK-0005G4-Dp for qemu-devel@nongnu.org; Thu, 23 May 2019 07:24:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53565) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTlpK-0005F7-7B for qemu-devel@nongnu.org; Thu, 23 May 2019 07:24:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45E7E3003A5A; Thu, 23 May 2019 11:23:53 +0000 (UTC) Received: from redhat.com (ovpn-112-64.ams2.redhat.com [10.36.112.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64D795D9D2; Thu, 23 May 2019 11:23:45 +0000 (UTC) Date: Thu, 23 May 2019 12:23:43 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Message-ID: <20190523112343.GE20973@redhat.com> References: <20190523024229.1158-1-richard.henderson@linaro.org> <20190523024229.1158-2-richard.henderson@linaro.org> <20190523110736.GD20973@redhat.com> <26e22686-0b89-0b94-88f6-68e11b939697@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <26e22686-0b89-0b94-88f6-68e11b939697@redhat.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 23 May 2019 11:23:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: alex.bennee@linaro.org, Richard Henderson , qemu-devel@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, May 23, 2019 at 01:17:40PM +0200, Philippe Mathieu-Daud=C3=A9 wro= te: > On 5/23/19 1:07 PM, Daniel P. Berrang=C3=A9 wrote: > > On Wed, May 22, 2019 at 10:42:27PM -0400, Richard Henderson wrote: > >> Since v4.0, capstone.h has moved to . > >=20 > > NB this was a regression bug in capstone pkg-config file which has be= en > > fixed upstream > >=20 > > https://github.com/aquynh/capstone/pull/1276 > >=20 > > In Fedora we pulled in the fix to our v4.0 builds and I'd suggest > > other distros should do the same >=20 > Are you suggesting to not include this patch? It is less invasive to > distributions that package QEMU but don't package libcapstone. If building against a bundled capstone, we ought to be able to get the right -I flag to not need this. So its just a question of how how much we care about distros who've not fixed the regression. >=20 > >=20 > >> Signed-off-by: Richard Henderson > >> --- > >> include/disas/capstone.h | 4 ++++ > >> configure | 6 ++++++ > >> 2 files changed, 10 insertions(+) > >> > >> diff --git a/include/disas/capstone.h b/include/disas/capstone.h > >> index e29068dd97..90631d84a9 100644 > >> --- a/include/disas/capstone.h > >> +++ b/include/disas/capstone.h > >> @@ -3,7 +3,11 @@ > >> =20 > >> #ifdef CONFIG_CAPSTONE > >> =20 > >> +#ifdef CONFIG_CAPSTONE_CAPSTONE_H > >> +#include > >> +#else > >> #include > >> +#endif > >> =20 > >> #else > >> =20 > >> diff --git a/configure b/configure > >> index d2fc346302..eec7f061c3 100755 > >> --- a/configure > >> +++ b/configure > >> @@ -5021,6 +5021,9 @@ case "$capstone" in > >> system) > >> QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" > >> LIBS=3D"$($pkg_config --libs capstone) $LIBS" > >> + if check_include capstone/capstone.h; then > >> + capstone_capstone_h=3Dyes > >> + fi > >> ;; > >> =20 > >> no) > >> @@ -7197,6 +7200,9 @@ if test "$ivshmem" =3D "yes" ; then > >> fi > >> if test "$capstone" !=3D "no" ; then > >> echo "CONFIG_CAPSTONE=3Dy" >> $config_host_mak > >> + if test "$capstone_capstone_h" !=3D "no" ; then > >> + echo "CONFIG_CAPSTONE_CAPSTONE_H=3Dy" >> $config_host_mak > >> + fi > >> fi > >> if test "$debug_mutex" =3D "yes" ; then > >> echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak > >=20 > > Regards, > > Daniel > >=20 >=20 Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|