[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/6] target/arm: make pmccntr_op_start/finish static
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/6] target/arm: make pmccntr_op_start/finish static |
Date: |
Mon, 25 Mar 2019 14:31:52 +0000 |
From: Andrew Jones <address@hidden>
These functions are not used outside helper.c
Signed-off-by: Andrew Jones <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
target/arm/cpu.h | 11 -----------
target/arm/helper.c | 4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
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
--
2.20.1
- [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2019/03/25
- [Qemu-devel] [PULL 1/6] target/arm: Fix non-parallel expansion of CASP, Peter Maydell, 2019/03/25
- [Qemu-devel] [PULL 2/6] nrf51_gpio: reflect pull-up/pull-down to IRQs, Peter Maydell, 2019/03/25
- [Qemu-devel] [PULL 3/6] target/arm: add PCI_TESTDEV back to default config, Peter Maydell, 2019/03/25
- [Qemu-devel] [PULL 4/6] target/arm: fix crash on pmu register access, Peter Maydell, 2019/03/25
- [Qemu-devel] [PULL 6/6] target/arm: make pmccntr_op_start/finish static,
Peter Maydell <=
- [Qemu-devel] [PULL 5/6] target/arm: cortex-a7 and cortex-a15 have pmus, Peter Maydell, 2019/03/25
- Re: [Qemu-devel] [PULL 0/6] target-arm queue, Peter Maydell, 2019/03/25