From patchwork Wed Dec 15 10:40:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 524264 Delivered-To: patch@linaro.org Received: by 2002:a05:6e04:2287:0:0:0:0 with SMTP id bl7csp241040imb; Wed, 15 Dec 2021 03:26:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSbmTdIzmFmcZJQE0MIe+XymekYM6CVk6RV2YE5i+V1nGXWrwIXkGw3IJG2XWH1xyURAXr X-Received: by 2002:a25:c343:: with SMTP id t64mr5160321ybf.290.1639567594228; Wed, 15 Dec 2021 03:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639567594; cv=none; d=google.com; s=arc-20160816; b=RmwxsE+9oNxV2rhouTE9ihyRQBHDqjTMK4kC5ycVwE7mpxmAnZdBdU4/NVbxcFU/3A /4RxTpmWw+jnLNSOvaveXzoVTfz3aCldrPH3oQ4G1qK4ktzZNQkB3yn7r6MBE3I4gmnj GxwModFHkm427t4EWS907z3Yzg/BB2UE1DRn29MwXqvEdfZB4IypPRMvttgtwu7zTqC9 EBM6Z0t6DCa74mcSQfGCYq4NnrZvC70ACys4+QCCzRcu2EMGW/SrUcd3c8yOTxv6vALw cpSi++AolrJWv0EjZgVyQzGOnOpUQxT66hOF3HV2u15RY17oL77ZMxzcsfDTgi7XlYgd ByGw== 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:to:from :dkim-signature; bh=V9ad1ft9XN2bt0JubTin4DNNl6fvaB1gNU6QqLOH+X4=; b=h9sV6aM53sj+VVzO2FTyQwnInfM1l+mbn8zqpk5SItCL0dqYidpU84l9Bil5xW4ugX WmW7thRGprCLPj7WJDnugST5Q9bzWk++fuMy6uxPPxF7Rtt115sDtmczTAt31Dyri3PX CYzvvFyf6IFWvWZd6/WpIA7YTqV+1hlI2WXK24qFcFakdu3Oxe3XRPq1VAcKKb3LMrV/ Zeb5V9Aw20h5hUGVzWrTldNqvot+zLbjfpdOhim9gFd9rzENl+RWgxF5Cm2P4PAmAlb0 Z6TTSmrXkjE8drvCG+D/YgRBlXiQqPMpW3TDEVJxWGLGE2/xfIjb15kL6UijkuQzSJS7 4rYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xtIBO+Jq; 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 s4si2390270ybu.612.2021.12.15.03.26.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Dec 2021 03:26:34 -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=pass header.i=@linaro.org header.s=google header.b=xtIBO+Jq; 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]:49612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxSQb-0000Db-Lc for patch@linaro.org; Wed, 15 Dec 2021 06:26:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxRif-0007Ax-6f for qemu-devel@nongnu.org; Wed, 15 Dec 2021 05:41:09 -0500 Received: from [2a00:1450:4864:20::32e] (port=54816 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxRiZ-0008Sy-Vs for qemu-devel@nongnu.org; Wed, 15 Dec 2021 05:41:08 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i12so16260185wmq.4 for ; Wed, 15 Dec 2021 02:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=V9ad1ft9XN2bt0JubTin4DNNl6fvaB1gNU6QqLOH+X4=; b=xtIBO+JqqB/Z+/MpxwX7miezjv3ktsJ7GPP+DCzCjRgzSFMF8gil0s4v4vzHep9KQ2 t8QpL/ZZsW9ChVEQS5ekuKczprC1JwzoTfQLut30GR3eGiKuPPRxHTytGmZobonu2j+i 8z62TjTxix1IGKONWM3OQXuLLi/klIzxakfuTBDYDnnH6uwQBO5ZLLt3DhUQdWXLJP7A qEmH0AttBUhM/KRGFkDO8z6y4WuR4iM8uEY9Z1RmFIpKmd0yMRTfLH+ZTpoy9fOpqqu2 I6r+mLtj4bJHRUTjI4YIMYYx9axE8NYLKoKoP7+rB0d3xsd7S5DmkdIrkecoUeZq7L7f X2Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V9ad1ft9XN2bt0JubTin4DNNl6fvaB1gNU6QqLOH+X4=; b=d+FzgcaiszybSrJKXMql4R17b50Lx1Sm1i6y4lTTdovj5AEYUjyDMO3XuPcobX6Qw1 IzC5sVKxtfSF5ZLpPDT8IXaL/WYqCl78E188F05/0VDWPONjnlAyckf0UUq3EtA227zV YpNx0uaw2kuurZCd7G290A1+PDnBYph4zldB57EJZt28osBAM9vtrr48zH6FNDz8lnu9 +s0ZoeYtShgBR77Z+zRIAKxYA6fv/vjzgldZp0lbZ2pEwsAAv5GjAgXJx5L84EZGWDEt g7GH55Tykgmf4a9EDll2dVH9xATbewQd6ugLsUrcFGSCEnyyt6YNvKrFyiHaWl93z9Qu pOTg== X-Gm-Message-State: AOAM531VFcXtMYybMisGU3BTPq1zyP50rFq2lJXmOvV4RDvGV6qfdngW qHYAB9DX4vQnfpPKIgKpDcjV/fcvBAaXmQ== X-Received: by 2002:a7b:c054:: with SMTP id u20mr914736wmc.133.1639564862775; Wed, 15 Dec 2021 02:41:02 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e18sm1600815wrs.48.2021.12.15.02.41.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 02:41:02 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/33] target/hexagon/cpu.h: don't include qemu-common.h Date: Wed, 15 Dec 2021 10:40:37 +0000 Message-Id: <20211215104049.2030475-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211215104049.2030475-1-peter.maydell@linaro.org> References: <20211215104049.2030475-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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, 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: , 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: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Taylor Simpson Message-id: 20211129200510.1233037-3-peter.maydell@linaro.org --- 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"