From nobody Sat May 18 15:38:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618301412; cv=none; d=zohomail.com; s=zohoarc; b=EbnQw3qB/1gu6NPbDDE0xKlfWIJXiIZ+DhRsWSRobFqoSsGyup4RYjHVTED20k4Mu+eieoQSAtM3VSXLsyJVn6zzHneBc3GQH7MFreup0JzuqOnRsEMxjJsLsKZYwESdkb/l9Vqh6pwb2/bybn6ErSsOeD18MbUcxM4e69QNmiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618301412; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=/1LbSlSgHUfCQEcO9y0pv344AB8nCW5zeRWPXmoBzsk=; b=CgByeniC53/JHpyfr86p1rhrr1ZCZiRVM96VdeeBfyt2grSWcTjbE35pf0GlNCAMJ6KukYkenfzSkN5qU+HkqevTn6CwE4gMNTBOgU18ryLPFNq0jgFcRK6PccFMHqCZM5XbemB8w8zsJKpFLW0Rc/3nelu/l5X5iiAE3F+UK9c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 161830141218725.75476991805101; Tue, 13 Apr 2021 01:10:12 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id j5so14492688wrn.4 for ; Tue, 13 Apr 2021 01:10:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id u8sm4439645wrp.66.2021.04.13.01.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 01:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/1LbSlSgHUfCQEcO9y0pv344AB8nCW5zeRWPXmoBzsk=; b=HQ3A99Y30/6JDKPT5WJxwM1rDP+A0bvLeu7MIuDyV07He0O3N2kzHx3VXNEOgDyF/v 7tlzyaiAWULD8DsbNnaDqoJpt5rkoplB0w4zG83maOmw+OeAJyzL1naOVBA5jlN6WKgC Tisph465/wuvfedwezSed9wNpK6AwZOpDsashJQA7mLmNtxGaQKkfR9+YarQQy8a435M RyPmJsaUbKJQ9K8HomMhCLIvswL7Nn76WvrGNKVER//D7HCozRxKn/MUJeJvc8OTL+Qc VDx+Z/kqfZWvLyP/U4CnnpMt1d34/NL1Hxay0ST9/xWRFh6oJNkYVNJS1iiv7dMshUmr FtDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=/1LbSlSgHUfCQEcO9y0pv344AB8nCW5zeRWPXmoBzsk=; b=mk/+95cQ5Apl7LLVgOJw3B5GFuh6BtLVkj/VK4JGilE/3mNv4Yx0qq04Mt7Ztgycc9 2+Ng7NMm1XYNAa2NhrSM59YxZK5Fuy8Dik4Whakve93tdzOwyTFHy7RZ0oc9CQTdivmD ZhOti8JtA/Cc654S+M7wjl2fwsImcSkAobPY3aK+eYKrkqP1xvomor8e+TDSsor4cd8Z LRqTtiacVCiNkGlElnKMmcDiERL/+0atTNiU+jpKYawaDJ+qsN9fsZwmL60AOZzevnDM R8eXayqLMitSjGP7Pmq7dnLVR0vDBaS2Ka/Oypwp3XRBjuu+8wM/vAIWJoFHF3byhvD5 hzfA== X-Gm-Message-State: AOAM531f45J8Qr/Da/HxoGmXN2sJQv0m3AnzRBr8gr8rd3yvDfmpK3Bd RxRQvnQMfqSqn/v+nK1tI/c= X-Google-Smtp-Source: ABdhPJyUu3PBguVNIHHWJHKqKvSz/IqI5cSas2UseGis9160MrC436OzguytG6hXre1mGOyOvsetOg== X-Received: by 2002:a05:6000:54d:: with SMTP id b13mr34835327wrf.417.1618301410444; Tue, 13 Apr 2021 01:10:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.1] exec: Remove accel/tcg/ from include paths Date: Tue, 13 Apr 2021 10:10:08 +0200 Message-Id: <20210413081008.3409459-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When TCG is enabled, the accel/tcg/ include path is added to the project global include search list. This accel/tcg/ directory contains a header named "internal.h" which, while intented to be internal to accel/tcg/, is accessible by all files compiled when TCG is enabled. This might lead to problem with other directories using the same "internal.h" header name: $ git ls-files | fgrep /internal.h accel/tcg/internal.h include/hw/ide/internal.h target/hexagon/internal.h target/mips/internal.h target/ppc/internal.h target/s390x/internal.h As we don't need to expose accel/tcg/ internals to the rest of the code base, simplify by removing it from the include search list, and include the accel/tcg/ public headers relative to the project root search path (which is already in the generic include search path). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana --- Arguably public accel/tcg/ headers should be exposed under include/. --- meson.build | 1 - include/exec/helper-gen.h | 4 ++-- include/exec/helper-proto.h | 4 ++-- include/exec/helper-tcg.h | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index c6f4b0cf5e8..d8bb1ec5aa9 100644 --- a/meson.build +++ b/meson.build @@ -258,7 +258,6 @@ tcg_arch =3D 'riscv' endif add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tc= g_arch, - '-iquote', meson.current_source_dir() / 'accel/tcg= ', language: ['c', 'cpp', 'objc']) =20 accelerators +=3D 'CONFIG_TCG' diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 29c02f85dcc..1c2e7a8ed39 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -81,8 +81,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl= (ret) \ #include "helper.h" #include "trace/generated-helpers.h" #include "trace/generated-helpers-wrappers.h" -#include "tcg-runtime.h" -#include "plugin-helpers.h" +#include "accel/tcg/tcg-runtime.h" +#include "accel/tcg/plugin-helpers.h" =20 #undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_1 diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index 659f9298e8f..ba100793a7d 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -39,8 +39,8 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), d= h_ctype(t3), \ =20 #include "helper.h" #include "trace/generated-helpers.h" -#include "tcg-runtime.h" -#include "plugin-helpers.h" +#include "accel/tcg/tcg-runtime.h" +#include "accel/tcg/plugin-helpers.h" =20 #undef IN_HELPER_PROTO =20 diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 27870509a20..68885146355 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -60,8 +60,8 @@ =20 #include "helper.h" #include "trace/generated-helpers.h" -#include "tcg-runtime.h" -#include "plugin-helpers.h" +#include "accel/tcg/tcg-runtime.h" +#include "accel/tcg/plugin-helpers.h" =20 #undef str #undef DEF_HELPER_FLAGS_0 --=20 2.26.3