| Message ID | 20200505124159.24099-1-frankja@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: pv: Fix KVM_PV_PREP_RESET command wrapper name | expand |
On 05.05.20 14:41, Janosch Frank wrote: > s390_pv_perf_clear_reset() is not a very helpful name since that > function needs to be called for a normal and a clear reset via > diag308. > > Let's instead name it s390_pv_prep_reset() which reflects the purpose > of the function a bit better. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > hw/s390x/pv.c | 2 +- > hw/s390x/s390-virtio-ccw.c | 2 +- > include/hw/s390x/pv.h | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c > index f11868e865..ab3a2482aa 100644 > --- a/hw/s390x/pv.c > +++ b/hw/s390x/pv.c > @@ -88,7 +88,7 @@ int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) > return s390_pv_cmd(KVM_PV_UNPACK, &args); > } > > -void s390_pv_perf_clear_reset(void) > +void s390_pv_prep_reset(void) > { > s390_pv_cmd_exit(KVM_PV_PREP_RESET, NULL); > } > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 45292fb5a8..f2c0357aed 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -401,7 +401,7 @@ static void s390_pv_prepare_reset(S390CcwMachineState *ms) > s390_cpu_set_state(S390_CPU_STATE_STOPPED, S390_CPU(cs)); > } > s390_pv_unshare(); > - s390_pv_perf_clear_reset(); > + s390_pv_prep_reset(); > } > > static void s390_machine_reset(MachineState *machine) > diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h > index 522ca6a04e..aee758bc2d 100644 > --- a/include/hw/s390x/pv.h > +++ b/include/hw/s390x/pv.h > @@ -39,7 +39,7 @@ int s390_pv_vm_enable(void); > void s390_pv_vm_disable(void); > int s390_pv_set_sec_parms(uint64_t origin, uint64_t length); > int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak); > -void s390_pv_perf_clear_reset(void); > +void s390_pv_prep_reset(void); > int s390_pv_verify(void); > void s390_pv_unshare(void); > void s390_pv_inject_reset_error(CPUState *cs); > @@ -49,7 +49,7 @@ static inline int s390_pv_vm_enable(void) { return 0; } > static inline void s390_pv_vm_disable(void) {} > static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) { return 0; } > static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) { return 0; } > -static inline void s390_pv_perf_clear_reset(void) {} > +static inline void s390_pv_prep_reset(void) {} > static inline int s390_pv_verify(void) { return 0; } > static inline void s390_pv_unshare(void) {} > static inline void s390_pv_inject_reset_error(CPUState *cs) {}; > Reviewed-by: David Hildenbrand <david@redhat.com>
On Tue, 5 May 2020 08:41:59 -0400 Janosch Frank <frankja@linux.ibm.com> wrote: > s390_pv_perf_clear_reset() is not a very helpful name since that > function needs to be called for a normal and a clear reset via > diag308. > > Let's instead name it s390_pv_prep_reset() which reflects the purpose > of the function a bit better. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > hw/s390x/pv.c | 2 +- > hw/s390x/s390-virtio-ccw.c | 2 +- > include/hw/s390x/pv.h | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) Thanks, applied.
diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c index f11868e865..ab3a2482aa 100644 --- a/hw/s390x/pv.c +++ b/hw/s390x/pv.c @@ -88,7 +88,7 @@ int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) return s390_pv_cmd(KVM_PV_UNPACK, &args); } -void s390_pv_perf_clear_reset(void) +void s390_pv_prep_reset(void) { s390_pv_cmd_exit(KVM_PV_PREP_RESET, NULL); } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 45292fb5a8..f2c0357aed 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -401,7 +401,7 @@ static void s390_pv_prepare_reset(S390CcwMachineState *ms) s390_cpu_set_state(S390_CPU_STATE_STOPPED, S390_CPU(cs)); } s390_pv_unshare(); - s390_pv_perf_clear_reset(); + s390_pv_prep_reset(); } static void s390_machine_reset(MachineState *machine) diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h index 522ca6a04e..aee758bc2d 100644 --- a/include/hw/s390x/pv.h +++ b/include/hw/s390x/pv.h @@ -39,7 +39,7 @@ int s390_pv_vm_enable(void); void s390_pv_vm_disable(void); int s390_pv_set_sec_parms(uint64_t origin, uint64_t length); int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak); -void s390_pv_perf_clear_reset(void); +void s390_pv_prep_reset(void); int s390_pv_verify(void); void s390_pv_unshare(void); void s390_pv_inject_reset_error(CPUState *cs); @@ -49,7 +49,7 @@ static inline int s390_pv_vm_enable(void) { return 0; } static inline void s390_pv_vm_disable(void) {} static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) { return 0; } static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) { return 0; } -static inline void s390_pv_perf_clear_reset(void) {} +static inline void s390_pv_prep_reset(void) {} static inline int s390_pv_verify(void) { return 0; } static inline void s390_pv_unshare(void) {} static inline void s390_pv_inject_reset_error(CPUState *cs) {};
s390_pv_perf_clear_reset() is not a very helpful name since that function needs to be called for a normal and a clear reset via diag308. Let's instead name it s390_pv_prep_reset() which reflects the purpose of the function a bit better. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- hw/s390x/pv.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- include/hw/s390x/pv.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)