From patchwork Mon Mar 25 14:31:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 161128 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4049863jan; Mon, 25 Mar 2019 07:39:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1HrcsfJ2gxBYuEd/5zM5DUeETdK4j8QR0QsgJMiiQUIM+lghsEeYmbgNPn117ijCEjGqS X-Received: by 2002:a81:6b41:: with SMTP id g62mr21519544ywc.154.1553524755804; Mon, 25 Mar 2019 07:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553524755; cv=none; d=google.com; s=arc-20160816; b=HsIgPvlS5T50r4stDVr28tg5Hh3uEAeHO6yzRQ92wbh8N+jKBdRQ6PjyMDiM5pOFQT 8IZ0MuK0/jkz/I4kSAiYAi28pNcjYwzYYVErLogXHlKIZ4CqGP/nPE7J+VZ91NRgIAxF RJAxbRKVFpSMo21IDaUh3bBn8TQ4Kr39sBfP0SPg+xWuI/JLxdW2zwFIz8j54uRK3DHT aFe1YrSGJnmQUD8QbKMeLRGw6IYw5FK9AtMSXVTUZzqjJ/1bghpdvzwZhAyHiHa4LW3+ l+CEVq3JuyLZRXja32r87KJc0UhqsCRIHLM0ujRdf3L9FCewsWxwboB+eKLuoDra0n3w RhYg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=z/ppXOmLGbyBCPtJUcXjIA53Vpgb3lO8s8SPUJEHazw=; b=PIbV5Hbqz96jeosHd1PN1EU09ppP7LG3UZwDNdzstB+3O+v8/KxMiuZAsdvuvp2JiV 2vGeBvHwLG0RZkWGMx4wNyMDq6txvtQiDo2muzus5mwQkJC3CP1zEycOOWXOUUsbhjby eRQoB7XuvYEky468E7zp1crfFTjag0jspje6D7RbVY+SxKiYag9sTpITdjB3GUMK0TzA FzFv97dM1rWouejH4XXsIvaTFeHFDyXaYKa3D/KNnapqR5ortdaFDKplGdTz8QPpR7wm x3GPAvaxn66riuEqPcSKyAiiODjxO63WDDFt8wuy3rdP6XT58N8E10KQHh9s2CgG4pTr Kl8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UG3IW9jm; 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 b205si8986862ybc.339.2019.03.25.07.39.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:39:15 -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=fail header.i=@linaro.org header.s=google header.b=UG3IW9jm; 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 ([127.0.0.1]:43531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Qkt-0005YL-Bl for patch@linaro.org; Mon, 25 Mar 2019 10:39:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Qdw-0000Ps-R5 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8Qdv-00023r-R5 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:04 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8Qdv-00023N-Ip for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:32:03 -0400 Received: by mail-wr1-x435.google.com with SMTP id k11so3017970wro.5 for ; Mon, 25 Mar 2019 07:32:03 -0700 (PDT) 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=z/ppXOmLGbyBCPtJUcXjIA53Vpgb3lO8s8SPUJEHazw=; b=UG3IW9jmPhl4sYtqYvVhmlj3rbOCLlakcP9U1jgqzFfBFzi964GkqxVFzPoFufsdGi 0y9fLzNR+mA4Hx/IinTDd/x0Ah6ov/ypkJ3kfJvJAizMCBiX+/PNBeyMaFW6m0VXeJGS RR0zM46mvX7wDhJJSNRCXn1AXkaA8KWDL1ZoLBXgAjcG7abX1j3Aeb5hYRHKx4sf8hfN pejjUNbsfo4MEje4Rnu4HyWKbu9y0TqISHh1xSn3D0e+bKKbvAI5cDJnvpoaMhfehfaT q924vV5EH+YRamC6vuqlHD8eA6QCMDWJhYthi3L9hr0k8xM7AWLl//wES4fL2O0wHlgN 3ADw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z/ppXOmLGbyBCPtJUcXjIA53Vpgb3lO8s8SPUJEHazw=; b=ORS0P3HHVXqG7zSaVG2L5xm5FGuIJyKy+yfUOjrlbtPD4wbNQDk1y9C4+5iYNreBzQ cSnHAs1cZiKy6laHyvYF3rCti8Hk1SPf0a+sHnluPrpbEJ699DtN/A7oBO2AKRNITMTu LXdod+2ohk1JD5Q5hlLzXJ+wL2I8nMRYFG2wLehao0sGC/GY3Kjk9zaDbD4OQDQdzW9V TudbTysnfTwwsv2lgxAyqHpwfH9JOr8jos9jC+t/XKdHCEl2DzQFlYKQXwp41RayEFbJ HUJ7r5mUhcv8wxh6RCrgiXdeo6RMwqL57rigv9GF6MPkAFw2wZFIoATJq0RqvqpkQK5f RMBQ== X-Gm-Message-State: APjAAAXAwHwqLZxdB9Fw6HWEIe/72S2vjgj8qclUDtRGcBcWXEtHWKPe OBqRnO1Rd/5NPzf4BPBzvVJTX4AVNas= X-Received: by 2002:adf:e6c6:: with SMTP id y6mr16005979wrm.225.1553524322419; Mon, 25 Mar 2019 07:32:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.32.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 07:32:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2019 14:31:52 +0000 Message-Id: <20190325143152.9981-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org> References: <20190325143152.9981-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 6/6] target/arm: make pmccntr_op_start/finish static X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Andrew Jones These functions are not used outside helper.c Signed-off-by: Andrew Jones Reviewed-by: Richard Henderson Message-id: 20190322162333.17159-4-drjones@redhat.com Signed-off-by: Peter Maydell --- target/arm/cpu.h | 11 ----------- target/arm/helper.c | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) -- 2.20.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5f23c621325..d4d2836923d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -992,17 +992,6 @@ static inline bool is_a64(CPUARMState *env) int cpu_arm_signal_handler(int host_signum, void *pinfo, void *puc); -/** - * pmccntr_op_start/finish - * @env: CPUARMState - * - * Convert the counter in the PMCCNTR between its delta form (the typical mode - * when it's enabled) and the guest-visible value. These two calls must always - * surround any action which might affect the counter. - */ -void pmccntr_op_start(CPUARMState *env); -void pmccntr_op_finish(CPUARMState *env); - /** * pmu_op_start/finish * @env: CPUARMState diff --git a/target/arm/helper.c b/target/arm/helper.c index fc73488f6cc..a36f4b3d699 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1337,7 +1337,7 @@ static void pmu_update_irq(CPUARMState *env) * etc. can be done logically. This is essentially a no-op if the counter is * not enabled at the time of the call. */ -void pmccntr_op_start(CPUARMState *env) +static void pmccntr_op_start(CPUARMState *env) { uint64_t cycles = cycles_get_count(env); @@ -1367,7 +1367,7 @@ void pmccntr_op_start(CPUARMState *env) * guest-visible count. A call to pmccntr_op_finish should follow every call to * pmccntr_op_start. */ -void pmccntr_op_finish(CPUARMState *env) +static void pmccntr_op_finish(CPUARMState *env) { if (pmu_counter_enabled(env, 31)) { #ifndef CONFIG_USER_ONLY