[Qemu-devel] [PULL 0/1] Lonely uq/master patch for 2014-02-24

[Qemu-devel] [PULL 0/1] Lonely uq/master patch for 2014-02-24

[Paolo Bonzini]

Anthony, Peter,

The following changes since commit 7c08db30e6a43f7083a881eb07bfbc878e001e08:

  target-i386: Move KVM default-vendor hack to instance_init (2014-02-03 17:33:55 +0100)

are available in the git repository at:
  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

Paolo

Alexander Graf (1):
      KVM: Use return value for error print

 kvm-all.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[Qemu-devel] [PULL 1/1] KVM: Use return value for error print

[Paolo Bonzini]

From: Alexander Graf <agraf@suse.de>

Commit 94ccff13 introduced a more verbose failure message and retry
operations on KVM VM creation. However, it ended up using a variable
for its failure message that hasn't been initialized yet.

Fix it to use the value it meant to set.

Cc: qemu-stable@nongnu.org
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 kvm-all.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index f742f8d..979a8d9 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1427,7 +1427,7 @@ int kvm_init(void)
     } while (ret == -EINTR);
 
     if (ret < 0) {
-        fprintf(stderr, "ioctl(KVM_CREATE_VM) failed: %d %s\n", -s->vmfd,
+        fprintf(stderr, "ioctl(KVM_CREATE_VM) failed: %d %s\n", -ret,
                 strerror(-ret));
 
 #ifdef TARGET_S390X
-- 
1.7.1

Re: [Qemu-devel] [Qemu-stable] [PULL 1/1] KVM: Use return value for error print

[Michael Roth]

Quoting Paolo Bonzini (2014-02-25 04:44:56)
> From: Alexander Graf <agraf@suse.de>
> 
> Commit 94ccff13 introduced a more verbose failure message and retry
> operations on KVM VM creation. However, it ended up using a variable
> for its failure message that hasn't been initialized yet.
> 
> Fix it to use the value it meant to set.
> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Alexander Graf <agraf@suse.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Ping: last call for 1.7.1 (freeze today)

> ---
>  kvm-all.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kvm-all.c b/kvm-all.c
> index f742f8d..979a8d9 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1427,7 +1427,7 @@ int kvm_init(void)
>      } while (ret == -EINTR);
> 
>      if (ret < 0) {
> -        fprintf(stderr, "ioctl(KVM_CREATE_VM) failed: %d %s\n", -s->vmfd,
> +        fprintf(stderr, "ioctl(KVM_CREATE_VM) failed: %d %s\n", -ret,
>                  strerror(-ret));
> 
>  #ifdef TARGET_S390X
> -- 
> 1.7.1

Re: [Qemu-devel] [PULL 0/1] Lonely uq/master patch for 2014-02-24

[Peter Maydell]

On 25 February 2014 10:44, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Anthony, Peter,
>
> The following changes since commit 7c08db30e6a43f7083a881eb07bfbc878e001e08:
>
>   target-i386: Move KVM default-vendor hack to instance_init (2014-02-03 17:33:55 +0100)
>
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master
>
> Paolo
>
> Alexander Graf (1):
>       KVM: Use return value for error print
>
>  kvm-all.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks. (This didn't make it into my list of pull
requests to process because it is missing the magic words
"for you to fetch changes up to".)

-- PMM