From patchwork Sat May 1 18:51:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 430252 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp1520693jao; Sat, 1 May 2021 12:00:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxM5KIvaEYuuOzqEyndPjCZG2jmIEqpYzEDMYo3N0ydHIGMKfYJ/bI1QihYg2S4WrZBFwaq X-Received: by 2002:a05:6602:3146:: with SMTP id m6mr8778701ioy.158.1619895632745; Sat, 01 May 2021 12:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619895632; cv=none; d=google.com; s=arc-20160816; b=hfFrI16+cYwgEJ29Wwexv4vIwsFZuFw6qEGnadpgXbO38PfYpxbvrvYTlsqckrvXSX PfkpdorsWzGDRNZTsHOupUvCT8/gT/vySYRphR3+vOyFJTUStjJCZYH43GmmkLIHQbUs XZ3apgS8IwL7I95jz4Czr30Ptois/TLa3i9F8Zsfv2Yan3SpD9YLDot4/SyPLlgFLSQD opAC3WmrxinsCKzelA2YvZmYhfJ6VSL7vL0k5vRULC8vV4OFv9XLJVEjh7o7pBaeOIc2 +W5eST/k1PXBth4aNUxj7FIQsKIijImRlWDe9IXNbvrEehtGfcWGgcLiVQ/YOu/bBHln XjXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MSp5lRgjBRrXqczyQWvsoXEiHZoFgBy6aeylHhLetBE=; b=nk2YITNn8kF3MRq6cHadIyLovL9FHgjVD46U3S+g/cww3t4VgFSst9Rk9VjeC1nbW8 FR6TtmKIbMWzRHfT5jGT4Ymr0Os0LQ0P9/1hTfuBQ6mPJOjq0Q05OZbacrlddPucOLzJ GCS3/BunBZQlA5pWNVIJwof7PAICV6PprlMcenYjduntZtZDPMZ864VUZNMI6+bzI26B idt4uP6ml9cDMxk/gjKnopJZyJgRhlFjsTlj0VZxbILG2nOWyQe9tpEyb8t4AUQfHorP Na12weKdOZrs156RP5lrd0JvBYEgsOzs8KtWJ150WhuzAELPpWBBJxkqwgoHEFCv16sy kzsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B+44fskO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u20si6456346ilk.61.2021.05.01.12.00.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 May 2021 12:00:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B+44fskO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcuqu-0007Mn-6u for patch@linaro.org; Sat, 01 May 2021 15:00:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcui2-0006Ti-HB for qemu-devel@nongnu.org; Sat, 01 May 2021 14:51:24 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:40719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lcuhz-0003lB-Pb for qemu-devel@nongnu.org; Sat, 01 May 2021 14:51:22 -0400 Received: by mail-pj1-x1035.google.com with SMTP id l10-20020a17090a850ab0290155b06f6267so3444760pjn.5 for ; Sat, 01 May 2021 11:51:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MSp5lRgjBRrXqczyQWvsoXEiHZoFgBy6aeylHhLetBE=; b=B+44fskOVmU0wMMz5PCemfAGi0+oR2wue0LcxEHZ4Hs/ax9Tl8UqMU4uTgDwJPkWfZ 9nnYBihzTs6U9kmxYgXAJfxO7gRt0zTcoPI4pjsuU3vEScScd5ulovKKt3Tw6CKdsi7s ckrRrvXYGbvT90yh9a+9yohXcM3wYStSaAhSd9c/ofk3XWfn16Usl6SmHBONVxll1MTz +gtwwEeal+ptRE+pFHdlKIgB6WZBAn0BIKUxW0hz7eyhSwnzKzpmvSsMyHldXF5vOSIy 8q/tWpjV6FpAeh6DTa7TtCFmEXHW2kkm2u1HjnJqVsfCR67nLUoBKBd3SFfoZyoeY2Uh Wj1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MSp5lRgjBRrXqczyQWvsoXEiHZoFgBy6aeylHhLetBE=; b=dx0JDiTNJ8i4hkAjt4eAffuOYJWTCTvWcnuaGdtOe97CsK5bMSJlMaXOE/otxMGl9i OsOWllXnqED/xQLHB+uCdvPUSnO9adYFQop2m/rF42oHEbIrIVkiP6mOkxtQRPaSex5m ZDViuT8vFuG2lha2sreJDHGkwvqc1rHx7/gGf++wGPvnbaGdidsk0ZZk802/J9v6Lf1U ggtB6KLGEt9NsycRRKASQXlkzV1QdFej9X/cizopJ2D0cKlhib8cdxRCzTMLFdD1RHwU K6dURS52Oa6u8AtUuUgGTnGE0sSdUjHT94YpcRoA+Oza87ww+YIbmNJ/oitVARfRfjYZ wS4Q== X-Gm-Message-State: AOAM532L7cMH5m1C7Rvwktqp80FUbT4MR1+sXOnibhneX71JyS9kjcgJ xD9bPEqMNBQ+nL/+tDGniAFym6TENDK8qg== X-Received: by 2002:a17:902:b494:b029:e7:36be:9ce7 with SMTP id y20-20020a170902b494b02900e736be9ce7mr11537495plr.43.1619895078228; Sat, 01 May 2021 11:51:18 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id k17sm4971360pfa.68.2021.05.01.11.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 11:51:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/5] exec: Remove accel/tcg/ from include paths Date: Sat, 1 May 2021 11:51:12 -0700 Message-Id: <20210501185116.1338875-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501185116.1338875-1-richard.henderson@linaro.org> References: <20210501185116.1338875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Claudio Fontana Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Reviewed-by: Claudio Fontana Message-Id: <20210413081008.3409459-1-f4bug@amsat.org> Signed-off-by: Richard Henderson --- 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(-) -- 2.25.1 diff --git a/meson.build b/meson.build index c6f4b0cf5e..d8bb1ec5aa 100644 --- a/meson.build +++ b/meson.build @@ -258,7 +258,6 @@ if not get_option('tcg').disabled() tcg_arch = 'riscv' endif add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch, - '-iquote', meson.current_source_dir() / 'accel/tcg', language: ['c', 'cpp', 'objc']) accelerators += 'CONFIG_TCG' diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 29c02f85dc..1c2e7a8ed3 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" #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 659f9298e8..ba100793a7 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), dh_ctype(t3), \ #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" #undef IN_HELPER_PROTO diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 27870509a2..6888514635 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -60,8 +60,8 @@ #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" #undef str #undef DEF_HELPER_FLAGS_0