[Qemu-devel] [PULL 0/1] target-arm queue

[Qemu-devel] [PULL 0/1] target-arm queue

[Peter Maydell]

Last target-arm pullreq before the hardfreeze; just a
single patch. (Actually it's a bugfix patch so strictly
it could go in post-freeze, but anyway.)

Please pull.

thanks
-- PMM


The following changes since commit 743bddb4b35ceaaf6f95aea581a4130dcae6205a:

  Merge remote-tracking branch 'stefanha/tracing' into staging (2013-05-03 11:20:16 -0500)

are available in the git repository at:


  git://git.linaro.org/people/pmaydell/qemu-arm.git target-arm.next

for you to fetch changes up to 536f25e4c77592b936e50728c83894c23f4f61c8:

  target-arm: Fix incorrect check of kvm_vcpu_ioctl return value (2013-05-03 18:47:22 +0100)

----------------------------------------------------------------
Peter Maydell (1):
      target-arm: Fix incorrect check of kvm_vcpu_ioctl return value

 target-arm/kvm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/1] target-arm: Fix incorrect check of kvm_vcpu_ioctl return value

[Peter Maydell]

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>
---
 target-arm/kvm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index d8acace..b7bdc03 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;
 }
-- 
1.7.9.5

Re: [Qemu-devel] [PULL 0/1] target-arm queue

[Blue Swirl]

Thanks, pulled.

On Fri, May 3, 2013 at 5:58 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Last target-arm pullreq before the hardfreeze; just a
> single patch. (Actually it's a bugfix patch so strictly
> it could go in post-freeze, but anyway.)
>
> Please pull.
>
> thanks
> -- PMM
>
>
> The following changes since commit 743bddb4b35ceaaf6f95aea581a4130dcae6205a:
>
>   Merge remote-tracking branch 'stefanha/tracing' into staging (2013-05-03 11:20:16 -0500)
>
> are available in the git repository at:
>
>
>   git://git.linaro.org/people/pmaydell/qemu-arm.git target-arm.next
>
> for you to fetch changes up to 536f25e4c77592b936e50728c83894c23f4f61c8:
>
>   target-arm: Fix incorrect check of kvm_vcpu_ioctl return value (2013-05-03 18:47:22 +0100)
>
> ----------------------------------------------------------------
> Peter Maydell (1):
>       target-arm: Fix incorrect check of kvm_vcpu_ioctl return value
>
>  target-arm/kvm.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)