Re: [PATCH 46/54] target/riscv: fix incorrect QAPI types and u8 casting

2026-05-12 Thread Alistair Francis
On Sun, May 10, 2026 at 11:53 PM Marc-André Lureau
 wrote:
>
> "pmu_num" is u8, "pmu_mask" is u32, so is "pmp-granularity"
>
> Signed-off-by: Marc-André Lureau 

Reviewed-by: Alistair Francis 

Alistair

> ---
>  target/riscv/cpu.c | 9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 7d0cf88d48d..235764462cb 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -1467,7 +1467,7 @@ static void prop_pmu_num_get(Object *obj, Visitor *v, 
> const char *name,
>  }
>
>  static const PropertyInfo prop_pmu_num = {
> -.type = "int8",
> +.type = "uint8",
>  .description = "pmu-num",
>  .get = prop_pmu_num_get,
>  .set = prop_pmu_num_set,
> @@ -1503,13 +1503,13 @@ static void prop_pmu_mask_set(Object *obj, Visitor 
> *v, const char *name,
>  static void prop_pmu_mask_get(Object *obj, Visitor *v, const char *name,
>   void *opaque, Error **errp)
>  {
> -uint8_t pmu_mask = RISCV_CPU(obj)->cfg.pmu_mask;
> +uint32_t pmu_mask = RISCV_CPU(obj)->cfg.pmu_mask;
>
> -visit_type_uint8(v, name, &pmu_mask, errp);
> +visit_type_uint32(v, name, &pmu_mask, errp);
>  }
>
>  static const PropertyInfo prop_pmu_mask = {
> -.type = "int8",
> +.type = "uint32",
>  .description = "pmu-mask",
>  .get = prop_pmu_mask_get,
>  .set = prop_pmu_mask_set,
> @@ -1651,6 +1651,7 @@ static void prop_pmp_granularity_get(Object *obj, 
> Visitor *v, const char *name,
>  }
>
>  static const PropertyInfo prop_pmp_granularity = {
> +.type = "uint32",
>  .description = "pmp-granularity",
>  .get = prop_pmp_granularity_get,
>  .set = prop_pmp_granularity_set,
>
> --
> 2.54.0
>
>



[PATCH 46/54] target/riscv: fix incorrect QAPI types and u8 casting

2026-05-10 Thread Marc-André Lureau
"pmu_num" is u8, "pmu_mask" is u32, so is "pmp-granularity"

Signed-off-by: Marc-André Lureau 
---
 target/riscv/cpu.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 7d0cf88d48d..235764462cb 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1467,7 +1467,7 @@ static void prop_pmu_num_get(Object *obj, Visitor *v, 
const char *name,
 }
 
 static const PropertyInfo prop_pmu_num = {
-.type = "int8",
+.type = "uint8",
 .description = "pmu-num",
 .get = prop_pmu_num_get,
 .set = prop_pmu_num_set,
@@ -1503,13 +1503,13 @@ static void prop_pmu_mask_set(Object *obj, Visitor *v, 
const char *name,
 static void prop_pmu_mask_get(Object *obj, Visitor *v, const char *name,
  void *opaque, Error **errp)
 {
-uint8_t pmu_mask = RISCV_CPU(obj)->cfg.pmu_mask;
+uint32_t pmu_mask = RISCV_CPU(obj)->cfg.pmu_mask;
 
-visit_type_uint8(v, name, &pmu_mask, errp);
+visit_type_uint32(v, name, &pmu_mask, errp);
 }
 
 static const PropertyInfo prop_pmu_mask = {
-.type = "int8",
+.type = "uint32",
 .description = "pmu-mask",
 .get = prop_pmu_mask_get,
 .set = prop_pmu_mask_set,
@@ -1651,6 +1651,7 @@ static void prop_pmp_granularity_get(Object *obj, Visitor 
*v, const char *name,
 }
 
 static const PropertyInfo prop_pmp_granularity = {
+.type = "uint32",
 .description = "pmp-granularity",
 .get = prop_pmp_granularity_get,
 .set = prop_pmp_granularity_set,

-- 
2.54.0