Commit f7a87c42 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm 

* 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Fix incorrect check of kvm_vcpu_ioctl return value
parents 120dc38f 536f25e4

target-arm/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}