From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 May 2013 17:47:22 +0000 (+0100)
Subject: target-arm: Fix incorrect check of kvm_vcpu_ioctl return value
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~459^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=536f25e4c77592b936e50728c83894c23f4f61c8;p=qemu-upstream-4.4-testing.git

target-arm: Fix incorrect check of kvm_vcpu_ioctl return value

kvm_vcpu_ioctl() returns -ETHING on error, not ETHING -- correct
an incorrect check in kvm_arch_init_vcpu(). This would not have
had any significant ill-effects -- we would just have propagated
the less useful ENOENT up to the caller rather than the more
accurate EINVAL in the unlikely case that the kernel didn't
have VFP-D32 support.

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

diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index d8acace9b..b7bdc034f 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -62,8 +62,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
     r.id = KVM_REG_ARM | KVM_REG_SIZE_U64 | KVM_REG_ARM_VFP | 31;
     r.addr = (uintptr_t)(&v);
     ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &r);
-    if (ret == ENOENT) {
-        return EINVAL;
+    if (ret == -ENOENT) {
+        return -EINVAL;
     }
     return ret;
 }