Skip to contentSkip to conversation

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

PATCH In review Gautam Menghani 4 participants 4 messages Dec 2, 2025 – Jan 5 KVM

lore
Share & tools
lore
#0 lore raw

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

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.

---
 target/ppc/kvm.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
target/ppc/kvm.c +9 -9
index 43124bf1c7..464240d911 100644
@@ -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)
Signature · 1 line
2.51.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Gautam Menghani

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.

---

Quoted 59 lines
  target/ppc/kvm.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
target/ppc/kvm.c +9 -9
index 43124bf1c7..464240d911 100644
@@ -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 lore raw
In reply to Gautam Menghani
Quoted 9 lines · Gautam Menghani

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.

---
  target/ppc/kvm.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

Nice cleanup, thanks!

#3 lore raw
In reply to Gautam Menghani
Quoted 9 lines · Gautam Menghani

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.

---
  target/ppc/kvm.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)

Queued.