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

[Christoffer Dall <christoffer.dall@linaro.org>]

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>
---
 target-arm/kvm32.c | 13 +++++++++++--
 target-arm/kvm64.c |  8 +++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c
index 5ec4eb1..1fd0e83 100644
--- a/target-arm/kvm32.c
+++ b/target-arm/kvm32.c
@@ -511,9 +511,18 @@ int kvm_arch_get_registers(CPUState *cs)
 
 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();
+    }
 }
diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
index c615286..101354a 100644
--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@@ -263,8 +263,14 @@ int kvm_arch_get_registers(CPUState *cs)
 
 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));
+    ret = kvm_arm_vcpu_init(CPU(cpu));
+    if (ret < 0) {
+        fprintf(stderr, "kvm_arm_vcpu_init failed: %s\n", strerror(ret));
+        abort();
+    }
 }
-- 
2.1.2.330.g565301e.dirty