aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2014-12-11 12:07:53 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-12-11 12:07:53 +0000
commit25f2895e0e437a3548f9794846001fb5d5ab853d (patch)
treedc052447a7134a4b71ae952136e3d19796090640
parenta7130a3ef9b8dc3091a0700abb61e2926e89e916 (diff)
downloadqemu-tz-25f2895e0e437a3548f9794846001fb5d5ab853d.tar.gz
target-arm: Check error conditions on kvm_arm_reset_vcpu
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> Message-id: 1418039630-11773-1-git-send-email-christoffer.dall@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target-arm/kvm.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 191e759b3..4d81f3d76 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)