target/ppc/kvm : Use macro names instead of hardcoded constants as return values

[PATCH] target/ppc/kvm : Use macro names instead of hardcoded constants as return values

Posted by Gautam Menghani 1 week, 4 days ago

In the parse_* functions used to parse the return values of
KVM_PPC_GET_CPU_CHAR ioctl, the return values are hardcoded as numbers.
Use the macro names for better readability. No functional change
intended.

Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
---
 target/ppc/kvm.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 43124bf1c7..464240d911 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2450,26 +2450,26 @@ static int parse_cap_ppc_safe_cache(struct kvm_ppc_cpu_char c)
     bool l1d_thread_priv_req = !kvmppc_power8_host();
 
     if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_L1D_FLUSH_PR) {
-        return 2;
+        return SPAPR_CAP_FIXED;
     } else if ((!l1d_thread_priv_req ||
                 c.character & c.character_mask & H_CPU_CHAR_L1D_THREAD_PRIV) &&
                (c.character & c.character_mask
                 & (H_CPU_CHAR_L1D_FLUSH_ORI30 | H_CPU_CHAR_L1D_FLUSH_TRIG2))) {
-        return 1;
+        return SPAPR_CAP_WORKAROUND;
     }
 
-    return 0;
+    return SPAPR_CAP_BROKEN;
 }
 
 static int parse_cap_ppc_safe_bounds_check(struct kvm_ppc_cpu_char c)
 {
     if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_BNDS_CHK_SPEC_BAR) {
-        return 2;
+        return SPAPR_CAP_FIXED;
     } else if (c.character & c.character_mask & H_CPU_CHAR_SPEC_BAR_ORI31) {
-        return 1;
+        return SPAPR_CAP_WORKAROUND;
     }
 
-    return 0;
+    return SPAPR_CAP_BROKEN;
 }
 
 static int parse_cap_ppc_safe_indirect_branch(struct kvm_ppc_cpu_char c)
@@ -2486,15 +2486,15 @@ static int parse_cap_ppc_safe_indirect_branch(struct kvm_ppc_cpu_char c)
         return SPAPR_CAP_FIXED_IBS;
     }
 
-    return 0;
+    return SPAPR_CAP_BROKEN;
 }
 
 static int parse_cap_ppc_count_cache_flush_assist(struct kvm_ppc_cpu_char c)
 {
     if (c.character & c.character_mask & H_CPU_CHAR_BCCTR_FLUSH_ASSIST) {
-        return 1;
+        return SPAPR_CAP_WORKAROUND;
     }
-    return 0;
+    return SPAPR_CAP_BROKEN;
 }
 
 bool kvmppc_has_cap_xive(void)
-- 
2.51.1

Re: [PATCH] target/ppc/kvm : Use macro names instead of hardcoded constants as return values

Posted by Philippe Mathieu-Daudé 1 week, 2 days ago

On 2/12/25 13:46, Gautam Menghani wrote:
> In the parse_* functions used to parse the return values of
> KVM_PPC_GET_CPU_CHAR ioctl, the return values are hardcoded as numbers.
> Use the macro names for better readability. No functional change
> intended.
> 
> Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
> ---
>   target/ppc/kvm.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)

Nice cleanup, thanks!

Re: [PATCH] target/ppc/kvm : Use macro names instead of hardcoded constants as return values

Posted by Chinmay Rath 1 week, 2 days ago

On 12/2/25 18:16, Gautam Menghani wrote:
> In the parse_* functions used to parse the return values of
> KVM_PPC_GET_CPU_CHAR ioctl, the return values are hardcoded as numbers.
> Use the macro names for better readability. No functional change
> intended.
>
> Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
> ---
Reviewed-by: Chinmay Rath <rathc@linux.ibm.com>
>   target/ppc/kvm.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 43124bf1c7..464240d911 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -2450,26 +2450,26 @@ static int parse_cap_ppc_safe_cache(struct kvm_ppc_cpu_char c)
>       bool l1d_thread_priv_req = !kvmppc_power8_host();
>   
>       if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_L1D_FLUSH_PR) {
> -        return 2;
> +        return SPAPR_CAP_FIXED;
>       } else if ((!l1d_thread_priv_req ||
>                   c.character & c.character_mask & H_CPU_CHAR_L1D_THREAD_PRIV) &&
>                  (c.character & c.character_mask
>                   & (H_CPU_CHAR_L1D_FLUSH_ORI30 | H_CPU_CHAR_L1D_FLUSH_TRIG2))) {
> -        return 1;
> +        return SPAPR_CAP_WORKAROUND;
>       }
>   
> -    return 0;
> +    return SPAPR_CAP_BROKEN;
>   }
>   
>   static int parse_cap_ppc_safe_bounds_check(struct kvm_ppc_cpu_char c)
>   {
>       if (~c.behaviour & c.behaviour_mask & H_CPU_BEHAV_BNDS_CHK_SPEC_BAR) {
> -        return 2;
> +        return SPAPR_CAP_FIXED;
>       } else if (c.character & c.character_mask & H_CPU_CHAR_SPEC_BAR_ORI31) {
> -        return 1;
> +        return SPAPR_CAP_WORKAROUND;
>       }
>   
> -    return 0;
> +    return SPAPR_CAP_BROKEN;
>   }
>   
>   static int parse_cap_ppc_safe_indirect_branch(struct kvm_ppc_cpu_char c)
> @@ -2486,15 +2486,15 @@ static int parse_cap_ppc_safe_indirect_branch(struct kvm_ppc_cpu_char c)
>           return SPAPR_CAP_FIXED_IBS;
>       }
>   
> -    return 0;
> +    return SPAPR_CAP_BROKEN;
>   }
>   
>   static int parse_cap_ppc_count_cache_flush_assist(struct kvm_ppc_cpu_char c)
>   {
>       if (c.character & c.character_mask & H_CPU_CHAR_BCCTR_FLUSH_ASSIST) {
> -        return 1;
> +        return SPAPR_CAP_WORKAROUND;
>       }
> -    return 0;
> +    return SPAPR_CAP_BROKEN;
>   }
>   
>   bool kvmppc_has_cap_xive(void)