From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGLZ-0003iA-Ip for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:16:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGLT-0000Mb-LR for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:16:25 -0500 Received: from mail-lb0-f179.google.com ([209.85.217.179]:63470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGLT-0000MS-DW for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:16:19 -0500 Received: by mail-lb0-f179.google.com with SMTP id z11so12820880lbi.38 for ; Wed, 03 Dec 2014 12:16:18 -0800 (PST) From: Christoffer Dall Date: Wed, 3 Dec 2014 21:17:02 +0100 Message-Id: <1417637822-28984-1-git-send-email-christoffer.dall@linaro.org> Subject: [Qemu-devel] [PATCH] target-arm: Check error conditions on kvm_arm_reset_vcpu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvmarm@lists.cs.columbia.edu, 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 --- 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