From patchwork Mon Nov 29 20:05:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 519724 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6567758imj; Mon, 29 Nov 2021 12:07:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbaGviUgwWTkmaziHy2QQXAxqVJyZ8FPeiumemj1sRE4SZePLrz1kDNqlDGW3Gpjjaub6z X-Received: by 2002:a7b:c207:: with SMTP id x7mr225532wmi.108.1638216431298; Mon, 29 Nov 2021 12:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638216431; cv=none; d=google.com; s=arc-20160816; b=uPBQoC4VfMvCFPFXQy0IDxkAT73fRhdjFCt4ZDaZernsJ3vEy7e8Y/fNEd2Jh9QHYg lGqYnsmlfBDVbs9Y3ueqmdXINj0m8LGcSi2KNR6aWJBgeEIMZFNbjloF2/gA0leDJmei UoVYlhEhqmdD+icDnLgv9bgJbIRG7ff8rMtGWkwMZzL0o4NdmS0QYN0GV1Q1tA2/eM1F hrz/g4z37Jm7KGLIEUnJ4sCCaGe1NhH65e/OpMK025XX3YbxCqC1SesCjRXWR8HGf+iQ 7KrL83VG754RS6EPCw9Ew3TIFfdSulK6xn7ooKQhs1eI9/gBJbXyX0qJ2DEGBU2MssTb gc4g== 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=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=0nc8YDNumYlra3+zIUNLj6eVZeDe+2J3GdzuapA5R57piitjja60E7386uJLmKMS1o IB6mZIPwvWn/c8ZjlrbDgoUeNEuIjcX08Zx2bS3qdsASdm2RIE8F/+pa60IVs6YXgIL9 6t61vg5lKUAqd1TDVWgP26+pYMdX1uyadkl6W0ABzay4QW4LfT+rVhV152qLuIIjW169 ztSIBBTP0XoX06wMWGgJWV3X9Sy4tYKFG031LFTQCXQR4IA7+RXdfqqVsEokm15gXEut iavvzn+jWV3W5JfdadwOylRBRrcCdrOXF/qMalNopcl7EUGiUYHmoqxuzpkHMo+iU1ZQ Kj+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hVFWrzAG; 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=fail (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 b15si20038692wrq.466.2021.11.29.12.07.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Nov 2021 12:07:11 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=hVFWrzAG; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrmvd-0003TL-W9 for patch@linaro.org; Mon, 29 Nov 2021 15:07:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrmu0-0003Ov-3F for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:28 -0500 Received: from [2a00:1450:4864:20::32d] (port=55988 helo=mail-wm1-x32d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrmtq-0008Ce-Ht for qemu-devel@nongnu.org; Mon, 29 Nov 2021 15:05:27 -0500 Received: by mail-wm1-x32d.google.com with SMTP id p18so15622601wmq.5 for ; Mon, 29 Nov 2021 12:05:15 -0800 (PST) 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=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=hVFWrzAG6sPmitcIJZiRpD4zOIr/efmL+IgPmctw3dF6NV+XjHw56FsW/6b+ZmfcbC 1aqoyiikKJTM9BHIEsUFQcueUepxNeWWwzuQT5WGaiDJNoZL0HYIq/LJaD2Y03e5/k63 csGbmSZ8q86yYTswSviFjcg9VGDG3VnDU43bB38zdY1Kp0AIWj2mLBwAw+AXSMhaEG4P 55zzkgxedoJ/AOGgpznc2fdPmYSg2Ww9HDXEfi7lPDsN6LQEdVbJg+wB+EKNRIjoQEO1 I7VpIWJjzG19s7wrd4GGyJRU0kN6mf/P2msta0jHcYx4kPrs3P1L7uYClYnsbWxjIlq0 9s7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UnmMe2XVlfepy+SM6SWY8AYsfzJiHx81z75dkAVJ9Po=; b=xWkjjd23S6aspXGzCtgASspb5fC6Jl19jIWz4ZaRANvdP2lfAgg7bCeEgXNYfJcdPG YrZ2nvZVJ9Jr8eUIINKwbuGwfFWh/GiwC41KWE1xRKlWHrye1bkzrB4SWRQ1DpiBhnKO cE8wD+gRydW8Gesu2WKAxKoGJiB5PyAIzczh8uVc02xAMDoyeOiNBH8CitwIwxoh4IKh f2XM7WYw1NC0jfjvrqAsSaWKEa73JKzzDBdTt9JAa8vC8YswDfKOgN+ZQ5BPD30nP9rs KPtzWJzRKN6i3h4IApHznwC8nP5ali395jWdXzutIaFffqzU74lcAeGyIq+5xVhgSmbP fYtw== X-Gm-Message-State: AOAM530oqjYGqA74+fNgqzNq7tc/ihB6TwA9spactlY4LWJI5/jGn5Yb uiC8KtjZrwBemdrCvbBtM0v/hg== X-Received: by 2002:a1c:7f56:: with SMTP id a83mr225953wmd.32.1638216314846; Mon, 29 Nov 2021 12:05:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v15sm14678863wro.35.2021.11.29.12.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 12:05:14 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-7.0 2/4] target/hexagon/cpu.h: don't include qemu-common.h Date: Mon, 29 Nov 2021 20:05:08 +0000 Message-Id: <20211129200510.1233037-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129200510.1233037-1-peter.maydell@linaro.org> References: <20211129200510.1233037-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Paolo Bonzini , Taylor Simpson , Yoshinori Sato , Sergio Lopez Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The qemu-common.h header is not supposed to be included from any other header files, only from .c files (as documented in a comment at the start of it). Move the include to linux-user/hexagon/cpu_loop.c, which needs it for the declaration of cpu_exec_step_atomic(). Signed-off-by: Peter Maydell Reviewed-by: Taylor Simpson --- target/hexagon/cpu.h | 1 - linux-user/hexagon/cpu_loop.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index de121d950f2..58a0d3870bb 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -23,7 +23,6 @@ typedef struct CPUHexagonState CPUHexagonState; #include "fpu/softfloat-types.h" -#include "qemu-common.h" #include "exec/cpu-defs.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c index 6b24cbaba93..e47f8348d56 100644 --- a/linux-user/hexagon/cpu_loop.c +++ b/linux-user/hexagon/cpu_loop.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu.h" #include "user-internals.h" #include "cpu_loop-common.h"