1. Patchew
  2. Xen
  3. View series

[Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore]

Baodong Chen posted 1 patch 4 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/xen tags/patchew/1560143274-10547-1-git-send-email-chenbaodong@mxnavi.com
xen/arch/arm/vtimer.c        | 6 ++----
xen/include/asm-arm/vtimer.h | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
[Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore]
Posted by Baodong Chen 4 years, 10 months ago 
The original type is int and not used at all so fix to void.

Signed-off-by: Baodong Chen <chenbaodong@mxnavi.com>
---
 xen/arch/arm/vtimer.c        | 6 ++----
 xen/include/asm-arm/vtimer.h | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index c99dd23..e6aebda 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -136,7 +136,7 @@ void vcpu_timer_destroy(struct vcpu *v)
     kill_timer(&v->arch.phys_timer.timer);
 }
 
-int virt_timer_save(struct vcpu *v)
+void virt_timer_save(struct vcpu *v)
 {
     ASSERT(!is_idle_vcpu(v));
 
@@ -149,10 +149,9 @@ int virt_timer_save(struct vcpu *v)
         set_timer(&v->arch.virt_timer.timer, ticks_to_ns(v->arch.virt_timer.cval +
                   v->domain->arch.virt_timer_base.offset - boot_count));
     }
-    return 0;
 }
 
-int virt_timer_restore(struct vcpu *v)
+void virt_timer_restore(struct vcpu *v)
 {
     ASSERT(!is_idle_vcpu(v));
 
@@ -163,7 +162,6 @@ int virt_timer_restore(struct vcpu *v)
     WRITE_SYSREG64(v->domain->arch.virt_timer_base.offset, CNTVOFF_EL2);
     WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);
     WRITE_SYSREG32(v->arch.virt_timer.ctl, CNTV_CTL_EL0);
-    return 0;
 }
 
 static bool vtimer_cntp_ctl(struct cpu_user_regs *regs, uint32_t *r, bool read)
diff --git a/xen/include/asm-arm/vtimer.h b/xen/include/asm-arm/vtimer.h
index 91d88b3..9d4fb4c 100644
--- a/xen/include/asm-arm/vtimer.h
+++ b/xen/include/asm-arm/vtimer.h
@@ -24,8 +24,8 @@ extern int domain_vtimer_init(struct domain *d,
                               struct xen_arch_domainconfig *config);
 extern int vcpu_vtimer_init(struct vcpu *v);
 extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
-extern int virt_timer_save(struct vcpu *v);
-extern int virt_timer_restore(struct vcpu *v);
+extern void virt_timer_save(struct vcpu *v);
+extern void virt_timer_restore(struct vcpu *v);
 extern void vcpu_timer_destroy(struct vcpu *v);
 void vtimer_update_irqs(struct vcpu *v);
 
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore]
Posted by Julien Grall 4 years, 10 months ago 
Hi,

NIT: I would use "change" instead of "fix". I feel "fix" is more when 
there are an actual bug.

On 6/10/19 6:07 AM, Baodong Chen wrote:
> The original type is int and not used at all so fix to void.

The commit message is a bit unclear, you mention the type whereas the 
key point is none of the callers are using the return value. So how about:

"virt_timer_{save, return} always return 0 and none of the caller 
actually check it. So change the return type to void."

If you are happy with it, I can make the modifications them on commit.

Cheers,

> 
> Signed-off-by: Baodong Chen <chenbaodong@mxnavi.com>
> ---
>   xen/arch/arm/vtimer.c        | 6 ++----
>   xen/include/asm-arm/vtimer.h | 4 ++--
>   2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
> index c99dd23..e6aebda 100644
> --- a/xen/arch/arm/vtimer.c
> +++ b/xen/arch/arm/vtimer.c
> @@ -136,7 +136,7 @@ void vcpu_timer_destroy(struct vcpu *v)
>       kill_timer(&v->arch.phys_timer.timer);
>   }
>   
> -int virt_timer_save(struct vcpu *v)
> +void virt_timer_save(struct vcpu *v)
>   {
>       ASSERT(!is_idle_vcpu(v));
>   
> @@ -149,10 +149,9 @@ int virt_timer_save(struct vcpu *v)
>           set_timer(&v->arch.virt_timer.timer, ticks_to_ns(v->arch.virt_timer.cval +
>                     v->domain->arch.virt_timer_base.offset - boot_count));
>       }
> -    return 0;
>   }
>   
> -int virt_timer_restore(struct vcpu *v)
> +void virt_timer_restore(struct vcpu *v)
>   {
>       ASSERT(!is_idle_vcpu(v));
>   
> @@ -163,7 +162,6 @@ int virt_timer_restore(struct vcpu *v)
>       WRITE_SYSREG64(v->domain->arch.virt_timer_base.offset, CNTVOFF_EL2);
>       WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);
>       WRITE_SYSREG32(v->arch.virt_timer.ctl, CNTV_CTL_EL0);
> -    return 0;
>   }
>   
>   static bool vtimer_cntp_ctl(struct cpu_user_regs *regs, uint32_t *r, bool read)
> diff --git a/xen/include/asm-arm/vtimer.h b/xen/include/asm-arm/vtimer.h
> index 91d88b3..9d4fb4c 100644
> --- a/xen/include/asm-arm/vtimer.h
> +++ b/xen/include/asm-arm/vtimer.h
> @@ -24,8 +24,8 @@ extern int domain_vtimer_init(struct domain *d,
>                                 struct xen_arch_domainconfig *config);
>   extern int vcpu_vtimer_init(struct vcpu *v);
>   extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
> -extern int virt_timer_save(struct vcpu *v);
> -extern int virt_timer_restore(struct vcpu *v);
> +extern void virt_timer_save(struct vcpu *v);
> +extern void virt_timer_restore(struct vcpu *v);
>   extern void vcpu_timer_destroy(struct vcpu *v);
>   void vtimer_update_irqs(struct vcpu *v);
>   
> 

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore]
Posted by chenbaodong 4 years, 10 months ago 
On 6/11/19 04:16, Julien Grall wrote:
> Hi,
>
> NIT: I would use "change" instead of "fix". I feel "fix" is more when 
> there are an actual bug.
Sound good to me.
>
> On 6/10/19 6:07 AM, Baodong Chen wrote:
>> The original type is int and not used at all so fix to void.
>
> The commit message is a bit unclear, you mention the type whereas the 
> key point is none of the callers are using the return value. So how 
> about:
>
> "virt_timer_{save, return} always return 0 and none of the caller 
> actually check it. So change the return type to void."
>
> If you are happy with it, I can make the modifications them on commit.
happy with it, please.
>
> Cheers,
>
>>
>> Signed-off-by: Baodong Chen <chenbaodong@mxnavi.com>
>> ---
>>   xen/arch/arm/vtimer.c        | 6 ++----
>>   xen/include/asm-arm/vtimer.h | 4 ++--
>>   2 files changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
>> index c99dd23..e6aebda 100644
>> --- a/xen/arch/arm/vtimer.c
>> +++ b/xen/arch/arm/vtimer.c
>> @@ -136,7 +136,7 @@ void vcpu_timer_destroy(struct vcpu *v)
>>       kill_timer(&v->arch.phys_timer.timer);
>>   }
>>   -int virt_timer_save(struct vcpu *v)
>> +void virt_timer_save(struct vcpu *v)
>>   {
>>       ASSERT(!is_idle_vcpu(v));
>>   @@ -149,10 +149,9 @@ int virt_timer_save(struct vcpu *v)
>>           set_timer(&v->arch.virt_timer.timer, 
>> ticks_to_ns(v->arch.virt_timer.cval +
>>                     v->domain->arch.virt_timer_base.offset - 
>> boot_count));
>>       }
>> -    return 0;
>>   }
>>   -int virt_timer_restore(struct vcpu *v)
>> +void virt_timer_restore(struct vcpu *v)
>>   {
>>       ASSERT(!is_idle_vcpu(v));
>>   @@ -163,7 +162,6 @@ int virt_timer_restore(struct vcpu *v)
>> WRITE_SYSREG64(v->domain->arch.virt_timer_base.offset, CNTVOFF_EL2);
>>       WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);
>>       WRITE_SYSREG32(v->arch.virt_timer.ctl, CNTV_CTL_EL0);
>> -    return 0;
>>   }
>>     static bool vtimer_cntp_ctl(struct cpu_user_regs *regs, uint32_t 
>> *r, bool read)
>> diff --git a/xen/include/asm-arm/vtimer.h b/xen/include/asm-arm/vtimer.h
>> index 91d88b3..9d4fb4c 100644
>> --- a/xen/include/asm-arm/vtimer.h
>> +++ b/xen/include/asm-arm/vtimer.h
>> @@ -24,8 +24,8 @@ extern int domain_vtimer_init(struct domain *d,
>>                                 struct xen_arch_domainconfig *config);
>>   extern int vcpu_vtimer_init(struct vcpu *v);
>>   extern bool vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
>> -extern int virt_timer_save(struct vcpu *v);
>> -extern int virt_timer_restore(struct vcpu *v);
>> +extern void virt_timer_save(struct vcpu *v);
>> +extern void virt_timer_restore(struct vcpu *v);
>>   extern void vcpu_timer_destroy(struct vcpu *v);
>>   void vtimer_update_irqs(struct vcpu *v);
>>
>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] xen/arm: vtimer: fix return value to void for virt_timer_[save|restore]
Posted by Julien Grall 4 years, 10 months ago 

On 11/06/2019 01:06, chenbaodong wrote:
> 
> On 6/11/19 04:16, Julien Grall wrote:
>> Hi,
>>
>> NIT: I would use "change" instead of "fix". I feel "fix" is more when there 
>> are an actual bug.
> Sound good to me.
>>
>> On 6/10/19 6:07 AM, Baodong Chen wrote:
>>> The original type is int and not used at all so fix to void.
>>
>> The commit message is a bit unclear, you mention the type whereas the key 
>> point is none of the callers are using the return value. So how about:
>>
>> "virt_timer_{save, return} always return 0 and none of the caller actually 
>> check it. So change the return type to void."
>>
>> If you are happy with it, I can make the modifications them on commit.
> happy with it, please.

Committed, thank you!

Cheers,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.