[PULL,51/88] ppc: well form kvmppc_hint_smt_possible error hint helper

Commit Message

David Gibson Dec. 17, 2019, 4:42 a.m. UTC

From: Vladimir Sementsov-Ogievskiy <[e-mail]>

Make kvmppc_hint_smt_possible hint append helper well formed:
rename errp to errp_in, as it is IN-parameter here (which is unusual
for errp), rename function to be kvmppc_error_append_*_hint.

Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Reviewed-by: Marc-André Lureau <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Greg Kurz <[e-mail]>
Signed-off-by: David Gibson <[e-mail]>
---
 hw/ppc/spapr.c       | 2 +-
 target/ppc/kvm.c     | 6 +++---
 target/ppc/kvm_ppc.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Comments

Markus Armbruster Dec. 17, 2019, 6:32 a.m. UTC | #1

David Gibson <[e-mail]> writes:

> From: Vladimir Sementsov-Ogievskiy <[e-mail]>
>
> Make kvmppc_hint_smt_possible hint append helper well formed:
> rename errp to errp_in, as it is IN-parameter here (which is unusual
> for errp), rename function to be kvmppc_error_append_*_hint.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
> Reviewed-by: Marc-André Lureau <[e-mail]>
> Message-Id: <[e-mail]>
> Reviewed-by: Greg Kurz <[e-mail]>
> Signed-off-by: David Gibson <[e-mail]>

Review led to the commit message to be replaced for this and related
patches.  It's in my "[PULL 00/34] Error reporting patches for
2019-12-16".  No big deal, but if you respin, either steal that message
or drop this patch.

David Gibson Dec. 18, 2019, 3:12 a.m. UTC | #2

On Tue, Dec 17, 2019 at 07:32:15AM +0100, Markus Armbruster wrote:
> David Gibson <[e-mail]> writes:
> 
> > From: Vladimir Sementsov-Ogievskiy <[e-mail]>
> >
> > Make kvmppc_hint_smt_possible hint append helper well formed:
> > rename errp to errp_in, as it is IN-parameter here (which is unusual
> > for errp), rename function to be kvmppc_error_append_*_hint.
> >
> > Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
> > Reviewed-by: Marc-André Lureau <[e-mail]>
> > Message-Id: <[e-mail]>
> > Reviewed-by: Greg Kurz <[e-mail]>
> > Signed-off-by: David Gibson <[e-mail]>
> 
> Review led to the commit message to be replaced for this and related
> patches.  It's in my "[PULL 00/34] Error reporting patches for
> 2019-12-16".  No big deal, but if you respin, either steal that message
> or drop this patch.

Uh, sorry.  I realized moments before sending this that this patch had
been updated.  I didn't want to re-do all my pre-pull testing, though
and it's not actually harmful, so I left it.

Patch

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d9c9a2bcee..e3c7d487b8 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2564,7 +2564,7 @@  static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp)
                                       " requires the use of VSMT mode %d.\n",
                                       smp_threads, kvm_smt, spapr->vsmt);
                 }
-                kvmppc_hint_smt_possible(&local_err);
+                kvmppc_error_append_smt_possible_hint(&local_err);
                 goto out;
             }
         }
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index c77f9848ec..7406d18945 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2076,7 +2076,7 @@  int kvmppc_set_smt_threads(int smt)
     return ret;
 }
 
-void kvmppc_hint_smt_possible(Error **errp)
+void kvmppc_error_append_smt_possible_hint(Error **errp_in)
 {
     int i;
     GString *g;
@@ -2091,10 +2091,10 @@  void kvmppc_hint_smt_possible(Error **errp)
             }
         }
         s = g_string_free(g, false);
-        error_append_hint(errp, "%s.\n", s);
+        error_append_hint(errp_in, "%s.\n", s);
         g_free(s);
     } else {
-        error_append_hint(errp,
+        error_append_hint(errp_in,
                           "This KVM seems to be too old to support VSMT.\n");
     }
 }
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index 98bd7d5da6..47b08a4030 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -28,7 +28,7 @@  void kvmppc_set_papr(PowerPCCPU *cpu);
 int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
 void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
 int kvmppc_smt_threads(void);
-void kvmppc_hint_smt_possible(Error **errp);
+void kvmppc_error_append_smt_possible_hint(Error **errp_in);
 int kvmppc_set_smt_threads(int smt);
 int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
 int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
@@ -164,7 +164,7 @@  static inline int kvmppc_smt_threads(void)
     return 1;
 }
 
-static inline void kvmppc_hint_smt_possible(Error **errp)
+static inline void kvmppc_error_append_smt_possible_hint(Error **errp_in)
 {
     return;
 }