Re: [PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-22 Thread Alistair Francis 
On Tue, Feb 20, 2024 at 9:09 PM  wrote:
>
> From: Frank Chang 
>
> Add missing include guard in pmu.h to avoid the problem of double
> inclusion.
>
> Signed-off-by: Frank Chang 

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
>  target/riscv/pmu.h | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
> index 505fc850d3..7c0ad661e0 100644
> --- a/target/riscv/pmu.h
> +++ b/target/riscv/pmu.h
> @@ -16,6 +16,9 @@
>   * this program.  If not, see .
>   */
>
> +#ifndef RISCV_PMU_H
> +#define RISCV_PMU_H
> +
>  #include "cpu.h"
>  #include "qapi/error.h"
>
> @@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum 
> riscv_pmu_event_idx event_idx);
>  void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name);
>  int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
>uint32_t ctr_idx);
> +
> +#endif /* RISCV_PMU_H */
> --
> 2.43.0
>
>

Re: [PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-22 Thread Alistair Francis 
On Tue, Feb 20, 2024 at 9:09 PM  wrote:
>
> From: Frank Chang 
>
> Add missing include guard in pmu.h to avoid the problem of double
> inclusion.
>
> Signed-off-by: Frank Chang 

Reviewed-by: Alistair Francis 

Alistair

> ---
>  target/riscv/pmu.h | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
> index 505fc850d3..7c0ad661e0 100644
> --- a/target/riscv/pmu.h
> +++ b/target/riscv/pmu.h
> @@ -16,6 +16,9 @@
>   * this program.  If not, see .
>   */
>
> +#ifndef RISCV_PMU_H
> +#define RISCV_PMU_H
> +
>  #include "cpu.h"
>  #include "qapi/error.h"
>
> @@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum 
> riscv_pmu_event_idx event_idx);
>  void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name);
>  int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
>uint32_t ctr_idx);
> +
> +#endif /* RISCV_PMU_H */
> --
> 2.43.0
>
>

Re: [PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-21 Thread Atish Patra 

On 2/20/24 08:20, Daniel Henrique Barboza wrote:



On 2/20/24 08:08, frank.ch...@sifive.com wrote:

From: Frank Chang 

Add missing include guard in pmu.h to avoid the problem of double
inclusion.

Signed-off-by: Frank Chang 
---


Reviewed-by: Daniel Henrique Barboza 


  target/riscv/pmu.h | 5 +
  1 file changed, 5 insertions(+)

diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
index 505fc850d3..7c0ad661e0 100644
--- a/target/riscv/pmu.h
+++ b/target/riscv/pmu.h
@@ -16,6 +16,9 @@
   * this program.  If not, see .
   */
+#ifndef RISCV_PMU_H
+#define RISCV_PMU_H
+
  #include "cpu.h"
  #include "qapi/error.h"
@@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum 
riscv_pmu_event_idx event_idx);
  void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char 
*pmu_name);

  int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
    uint32_t ctr_idx);
+
+#endif /* RISCV_PMU_H */




Oops. Thanks for the fix.

Reviewed-by: Atish Patra

Re: [PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-20 Thread Daniel Henrique Barboza 




On 2/20/24 08:08, frank.ch...@sifive.com wrote:

From: Frank Chang 

Add missing include guard in pmu.h to avoid the problem of double
inclusion.

Signed-off-by: Frank Chang 
---


Reviewed-by: Daniel Henrique Barboza 


  target/riscv/pmu.h | 5 +
  1 file changed, 5 insertions(+)

diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
index 505fc850d3..7c0ad661e0 100644
--- a/target/riscv/pmu.h
+++ b/target/riscv/pmu.h
@@ -16,6 +16,9 @@
   * this program.  If not, see .
   */
  
+#ifndef RISCV_PMU_H

+#define RISCV_PMU_H
+
  #include "cpu.h"
  #include "qapi/error.h"
  
@@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum riscv_pmu_event_idx event_idx);

  void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name);
  int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
uint32_t ctr_idx);
+
+#endif /* RISCV_PMU_H */

Re: [PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-20 Thread Philippe Mathieu-Daudé 

On 20/2/24 12:08, frank.ch...@sifive.com wrote:

From: Frank Chang 

Add missing include guard in pmu.h to avoid the problem of double
inclusion.



In case it needs to be backported to stable releases:

Fixes: 3780e33732 ("target/riscv: Support mcycle/minstret write operation")

Reviewed-by: Philippe Mathieu-Daudé 


Signed-off-by: Frank Chang 
---
  target/riscv/pmu.h | 5 +
  1 file changed, 5 insertions(+)

diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
index 505fc850d3..7c0ad661e0 100644
--- a/target/riscv/pmu.h
+++ b/target/riscv/pmu.h
@@ -16,6 +16,9 @@
   * this program.  If not, see .
   */
  
+#ifndef RISCV_PMU_H

+#define RISCV_PMU_H
+
  #include "cpu.h"
  #include "qapi/error.h"
  
@@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum riscv_pmu_event_idx event_idx);

  void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name);
  int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
uint32_t ctr_idx);
+
+#endif /* RISCV_PMU_H */

[PATCH] target/riscv: Add missing include guard in pmu.h

2024-02-20 Thread frank . chang 
From: Frank Chang 

Add missing include guard in pmu.h to avoid the problem of double
inclusion.

Signed-off-by: Frank Chang 
---
 target/riscv/pmu.h | 5 +
 1 file changed, 5 insertions(+)

diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
index 505fc850d3..7c0ad661e0 100644
--- a/target/riscv/pmu.h
+++ b/target/riscv/pmu.h
@@ -16,6 +16,9 @@
  * this program.  If not, see .
  */
 
+#ifndef RISCV_PMU_H
+#define RISCV_PMU_H
+
 #include "cpu.h"
 #include "qapi/error.h"
 
@@ -31,3 +34,5 @@ int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum 
riscv_pmu_event_idx event_idx);
 void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name);
 int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value,
   uint32_t ctr_idx);
+
+#endif /* RISCV_PMU_H */
-- 
2.43.0