[Qemu-devel] [PATCH v2] target-arm: Check error conditions on kvm_arm_reset_vcpu

[Qemu-devel] [PATCH v2] target-arm: Check error conditions on kvm_arm_reset_vcpu

[Christoffer Dall]

When resetting a VCPU we currently call both kvm_arm_vcpu_init() and
write_kvmstate_to_list(), both of which can fail, but we never check the
return value.

The only choice here is to print an error an exit if the calls fail.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
Changes [v1 -> v2]:
 - Rebased onto Peter Maydell's "support migration/save/load on AArch64 CPUs"
   series.

 target-arm/kvm.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 191e759..4d81f3d 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -442,11 +442,20 @@ bool write_list_to_kvmstate(ARMCPU *cpu)
 
 void kvm_arm_reset_vcpu(ARMCPU *cpu)
 {
+    int ret;
+
     /* Re-init VCPU so that all registers are set to
      * their respective reset values.
      */
-    kvm_arm_vcpu_init(CPU(cpu));
-    write_kvmstate_to_list(cpu);
+    ret = kvm_arm_vcpu_init(CPU(cpu));
+    if (ret < 0) {
+        fprintf(stderr, "kvm_arm_vcpu_init failed: %s\n", strerror(-ret));
+        abort();
+    }
+    if (!write_kvmstate_to_list(cpu)) {
+        fprintf(stderr, "write_kvmstate_to_list failed\n");
+        abort();
+    }
 }
 
 void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)
-- 
2.1.2.330.g565301e.dirty

Re: [Qemu-devel] [PATCH v2] target-arm: Check error conditions on kvm_arm_reset_vcpu

[Peter Maydell]

On 8 December 2014 at 11:53, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> When resetting a VCPU we currently call both kvm_arm_vcpu_init() and
> write_kvmstate_to_list(), both of which can fail, but we never check the
> return value.
>
> The only choice here is to print an error an exit if the calls fail.
>
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [Qemu-devel] [PATCH v2] target-arm: Check error conditions on kvm_arm_reset_vcpu

[Christoffer Dall]

On Mon, Dec 08, 2014 at 12:53:50PM +0100, Christoffer Dall wrote:
> When resetting a VCPU we currently call both kvm_arm_vcpu_init() and
> write_kvmstate_to_list(), both of which can fail, but we never check the
> return value.
> 
> The only choice here is to print an error an exit if the calls fail.
> 
> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
> ---
> Changes [v1 -> v2]:
>  - Rebased onto Peter Maydell's "support migration/save/load on AArch64 CPUs"
>    series.

Forgot to mention that I also changed strerror(ret) to strerror(-ret).

-Christoffer

> 
>  target-arm/kvm.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/target-arm/kvm.c b/target-arm/kvm.c
> index 191e759..4d81f3d 100644
> --- a/target-arm/kvm.c
> +++ b/target-arm/kvm.c
> @@ -442,11 +442,20 @@ bool write_list_to_kvmstate(ARMCPU *cpu)
>  
>  void kvm_arm_reset_vcpu(ARMCPU *cpu)
>  {
> +    int ret;
> +
>      /* Re-init VCPU so that all registers are set to
>       * their respective reset values.
>       */
> -    kvm_arm_vcpu_init(CPU(cpu));
> -    write_kvmstate_to_list(cpu);
> +    ret = kvm_arm_vcpu_init(CPU(cpu));
> +    if (ret < 0) {
> +        fprintf(stderr, "kvm_arm_vcpu_init failed: %s\n", strerror(-ret));
> +        abort();
> +    }
> +    if (!write_kvmstate_to_list(cpu)) {
> +        fprintf(stderr, "write_kvmstate_to_list failed\n");
> +        abort();
> +    }
>  }
>  
>  void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)
> -- 
> 2.1.2.330.g565301e.dirty
> 

Re: [Qemu-devel] [PATCH v2] target-arm: Check error conditions on kvm_arm_reset_vcpu

[Peter Maydell]

On 8 December 2014 at 11:58, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On Mon, Dec 08, 2014 at 12:53:50PM +0100, Christoffer Dall wrote:
>> When resetting a VCPU we currently call both kvm_arm_vcpu_init() and
>> write_kvmstate_to_list(), both of which can fail, but we never check the
>> return value.
>>
>> The only choice here is to print an error an exit if the calls fail.
>>
>> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
>> ---
>> Changes [v1 -> v2]:
>>  - Rebased onto Peter Maydell's "support migration/save/load on AArch64 CPUs"
>>    series.
>
> Forgot to mention that I also changed strerror(ret) to strerror(-ret).

That's ok, I forgot to check that you had when I reviewed this :-)

-- PMM