From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH 3/3] use upstream kvm_vcpu_ioctl
Date: Thu, 15 Oct 2009 12:57:41 -0300
Message-ID: <20091015155741.GA9629@amt.cnet>
References: <1255537753-18694-1-git-send-email-glommer@redhat.com> <1255537753-18694-2-git-send-email-glommer@redhat.com> <1255537753-18694-3-git-send-email-glommer@redhat.com> <1255537753-18694-4-git-send-email-glommer@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, avi@redhat.com
To: Glauber Costa <glommer@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:65059 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757614AbZJOP6Y (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 15 Oct 2009 11:58:24 -0400
Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9FFvwWw025970
	for <kvm@vger.kernel.org>; Thu, 15 Oct 2009 11:57:58 -0400
Content-Disposition: inline
In-Reply-To: <1255537753-18694-4-git-send-email-glommer@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Wed, Oct 14, 2009 at 01:29:13PM -0300, Glauber Costa wrote:
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> ---
>  kvm-all.c      |    3 ---
>  qemu-kvm-x86.c |   20 ++++++++++----------
>  qemu-kvm.c     |   26 +++++++++++++-------------
>  qemu-kvm.h     |    1 +
>  4 files changed, 24 insertions(+), 26 deletions(-)
> 
> diff --git a/kvm-all.c b/kvm-all.c
> index 1356aa8..5ea999e 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -861,7 +861,6 @@ int kvm_vm_ioctl(KVMState *s, int type, ...)
>      return ret;
>  }
>  
> -#ifdef KVM_UPSTREAM
>  int kvm_vcpu_ioctl(CPUState *env, int type, ...)
>  {
>      int ret;
> @@ -879,8 +878,6 @@ int kvm_vcpu_ioctl(CPUState *env, int type, ...)
>      return ret;
>  }
>  
> -#endif
> -
>  int kvm_has_sync_mmu(void)
>  {
>  #ifdef KVM_CAP_SYNC_MMU
> diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
> index 8c4140d..fd0e6a9 100644
> --- a/qemu-kvm-x86.c
> +++ b/qemu-kvm-x86.c
> @@ -179,7 +179,7 @@ int kvm_enable_vapic(CPUState *env, uint64_t vapic)
>  		.vapic_addr = vapic,
>  	};
>  
> -	r = ioctl(env->kvm_fd, KVM_SET_VAPIC_ADDR, &va);
> +	r = kvm_vcpu_ioctl(env, KVM_SET_VAPIC_ADDR, &va);
>  	if (r == -1) {
>  		r = -errno;

Please convert the callers to check for < 0, not -1.