From patchwork Thu Sep 14 18:57:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 722594 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp559489wro; Thu, 14 Sep 2023 11:58:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3nrvgutWcQOtkrXvO6o3+18+WukB/OPjMhZIjEP0qoKR6YUSrrN4svKlD6kx0gxE+ANac X-Received: by 2002:a05:6214:768:b0:653:57a6:e78b with SMTP id f8-20020a056214076800b0065357a6e78bmr8998447qvz.53.1694717907408; Thu, 14 Sep 2023 11:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694717907; cv=none; d=google.com; s=arc-20160816; b=hLVoQfMmXOVBE2MfPIoSD1ulHLN3l3X0guQhQ8kip+v8HUZFSLUD1NKcC/7Z3fd1ji e6COVh/BGnoEl+s0YABILi5RBUyLoDjWo6i3bhI+Y2EVl+fn99gNupBgrvxjdkMWgQf0 0a13SOIAPpOkHWGNCMsqpXQN6GPehCGIW4sBq/ce0+IX+teRhjwVPYdDfNf+ou4kOzju UMYNb3vCHI4v1vYRTfqjfHI+b9jSx+LpdMVPNosT2xR7Nl9ObtUmMRTIOkn7V3o4uawS NVUg4MOSxO0Igg8G47tkcxuakWMbOjs7iyma2jmBNIg4SNrncJBOXjBtYY3gsqDjlhjr p3Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=G6XhQZvVBgWC3+5NPxxq2ysGkpZ/RJnJQOM81+rYNCU=; fh=N22+cq4r3bt3EFi1ekaqHEIttLrOanCgE4ldlzS79LU=; b=baQ0gVvB3mxmsjxBga04tpek5BXEfclaCkgdFmdrCDAj0odm879Ox5uebRIaHRqMZp 3oiUcfneJYErI25CUgWjVYt374pmgOD+iz/f5EY4FhCdQwTiOWeWEJv7YiZ8f36YrjeK HbNM0saWBsK5s29oVFRk8v3CpMWzo2DMJOthokoYF9DsM8daqp8vU9LON1COD5qtpWMB JCRl8gn2uYeWD/q25JZDPENnjmHuqXJYW13rAif3KRaVO4C+x+Im92D3OFyYD/147dLi hrTEzz32k5jUE56C1FpfLbDBxnZwFtM/s9ffl/PAPKQqXN68RWQgXyxHGihjWkrP9efP Hwlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=edF1e7Cc; 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 n15-20020a0c9d4f000000b006474300cbdcsi1294024qvf.39.2023.09.14.11.58.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Sep 2023 11:58:27 -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=edF1e7Cc; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgrXl-0008GS-11; Thu, 14 Sep 2023 14:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qgrXc-0008Dj-HQ for qemu-devel@nongnu.org; Thu, 14 Sep 2023 14:58:16 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgrXZ-0007hx-DL for qemu-devel@nongnu.org; Thu, 14 Sep 2023 14:58:15 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-502e6d632b6so1820060e87.0 for ; Thu, 14 Sep 2023 11:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694717891; x=1695322691; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G6XhQZvVBgWC3+5NPxxq2ysGkpZ/RJnJQOM81+rYNCU=; b=edF1e7CcdB8GQiaqS08m0eSaRV+oIC9431bmr6LlW5PrBliLA11KGDzluloDPejeDw npxKc7RRaDlY+ORzJizuKwyGehvLZ/T5vYq3MbUY9+M70/1cpNX+l1cfnHGfEmVOcFHW WQc689ufhgZnWy6ws+QxGbhIA2meNxoxkXRLFv5vdg4mf67SxfXwPK2rDZU5nIezbpcM FeKWEAyyNoypqC0vbkRsgt/l1LAIAPrEaiCKbvqnjleVI2Z3DLGaMWwR+3ZX9j3jmQf4 ezlbYO328CzxAH8lHOeXnpSZ6hCgbShpKj+f61mEl8Mp7zahskhMWfh6i2xRLZbtzsDZ hUPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694717891; x=1695322691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6XhQZvVBgWC3+5NPxxq2ysGkpZ/RJnJQOM81+rYNCU=; b=Il33jqw6/V1NUW210s0H7fkL/b/2xDfXpYoCzZR0pxG3YG9ENozXk7xH6oLSopyPK2 Z6ZExclhq+D3UwkjZiHUVmJtFMOUqDcrqqt50nUXGp7ern6/JLnT3f8kgdfy8HrhNBfG RMAZhifAwftEREueIQHQJ5frQqI9FWS8Nb25rhlRRksZ0aIIE/sbKcJx/3dOX/PMUI6p SYAypsWP1+lsAThFQ6peDhr49S55CRd40hNITfBSvmelff30PMAoDWEXF4rYTQjX0Gea zq57rP2lg4xeTqiyoVY4TBvLVGBeDPX4viIhv5w3P2S3uTsrNJ7QB9nlvMQHgB9LMdCb HkPw== X-Gm-Message-State: AOJu0YyfkQx7dg8XZ+/qHm3Q68DRoUwlAYJz2/uIBVwPmuJU2AWNCwEp 9oHt9KGqzyP9MvpRzI3kGakszEcRoV/ii4dtEWo= X-Received: by 2002:a05:6512:1151:b0:4f8:74b5:b4ec with SMTP id m17-20020a056512115100b004f874b5b4ecmr6051126lfg.41.1694717890738; Thu, 14 Sep 2023 11:58:10 -0700 (PDT) Received: from m1x-phil.lan (176-131-223-129.abo.bbox.fr. [176.131.223.129]) by smtp.gmail.com with ESMTPSA id b17-20020a1709063f9100b0099cbfee34e3sm1370102ejj.196.2023.09.14.11.58.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 14 Sep 2023 11:58:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= , Paolo Bonzini , Thomas Huth , Alessandro Di Federico , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Anton Johansson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 08/11] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h' Date: Thu, 14 Sep 2023 20:57:14 +0200 Message-ID: <20230914185718.76241-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914185718.76241-1-philmd@linaro.org> References: <20230914185718.76241-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=philmd@linaro.org; helo=mail-lf1-x133.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org accel/tcg/internal.h contains target specific declarations. Unit files including it become "target tainted": they can not be compiled as target agnostic. Rename using the '-target' suffix to make this explicit. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Anton Johansson --- accel/tcg/{internal.h => internal-target.h} | 6 +++--- accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/cputlb.c | 2 +- accel/tcg/monitor.c | 2 +- accel/tcg/tb-maint.c | 2 +- accel/tcg/tcg-all.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/translator.c | 2 +- accel/tcg/user-exec.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename accel/tcg/{internal.h => internal-target.h} (96%) diff --git a/accel/tcg/internal.h b/accel/tcg/internal-target.h similarity index 96% rename from accel/tcg/internal.h rename to accel/tcg/internal-target.h index cd6b9eb7f0..4ce3b29056 100644 --- a/accel/tcg/internal.h +++ b/accel/tcg/internal-target.h @@ -1,13 +1,13 @@ /* - * Internal execution defines for qemu + * Internal execution defines for qemu (target specific) * * Copyright (c) 2003 Fabrice Bellard * * SPDX-License-Identifier: LGPL-2.1-or-later */ -#ifndef ACCEL_TCG_INTERNAL_H -#define ACCEL_TCG_INTERNAL_H +#ifndef ACCEL_TCG_INTERNAL_TARGET_H +#define ACCEL_TCG_INTERNAL_TARGET_H #include "exec/exec-all.h" #include "exec/translate-all.h" diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index 8ac2af4d0c..55980417b4 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -22,7 +22,7 @@ #include "sysemu/tcg.h" #include "exec/exec-all.h" #include "qemu/plugin.h" -#include "internal.h" +#include "internal-target.h" bool tcg_allowed; diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 0e7eeef001..f5625e047a 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -42,7 +42,7 @@ #include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" -#include "internal.h" +#include "internal-target.h" /* -icount align implementation. */ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 31e34700ea..a912d746a9 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -35,7 +35,7 @@ #include "exec/translate-all.h" #include "trace.h" #include "tb-hash.h" -#include "internal.h" +#include "internal-target.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin-memory.h" #endif diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c index d48de23999..30724fdb98 100644 --- a/accel/tcg/monitor.c +++ b/accel/tcg/monitor.c @@ -16,7 +16,7 @@ #include "sysemu/cpu-timers.h" #include "sysemu/tcg.h" #include "tcg/tcg.h" -#include "internal.h" +#include "internal-target.h" static void dump_drift_info(GString *buf) diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index 32ae8af61c..85cf51445d 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -29,7 +29,7 @@ #include "tcg/tcg.h" #include "tb-hash.h" #include "tb-context.h" -#include "internal.h" +#include "internal-target.h" /* List iterators for lists of tagged pointers in TranslationBlock. */ diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 03dfd67e9e..b32e0b80ec 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -38,7 +38,7 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/boards.h" #endif -#include "internal.h" +#include "internal-target.h" struct TCGState { AccelState parent_obj; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 83e07b830f..6c09b7f50d 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -61,7 +61,7 @@ #include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" -#include "internal.h" +#include "internal-target.h" #include "perf.h" #include "tcg/insn-start-words.h" diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index d9fcb4cbe8..65219b52eb 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -14,7 +14,7 @@ #include "exec/translator.h" #include "exec/plugin-gen.h" #include "tcg/tcg-op-common.h" -#include "internal.h" +#include "internal-target.h" static void gen_io_start(void) { diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 17f9aff0cf..f925dd0305 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -29,7 +29,7 @@ #include "qemu/atomic128.h" #include "trace/trace-root.h" #include "tcg/tcg-ldst.h" -#include "internal.h" +#include "internal-target.h" __thread uintptr_t helper_retaddr;