From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NzyiP-0000fr-Tc
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:52:41 -0400
Received: from [140.186.70.92] (port=53578 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NzyiO-0000dk-As
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:52:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1NzyiM-0000wp-Nm
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:52:40 -0400
Received: from mx1.redhat.com ([209.132.183.28]:33052)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1NzyiM-0000wa-F9
	for qemu-devel@nongnu.org; Thu, 08 Apr 2010 16:52:38 -0400
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o38Kqai0027415
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 8 Apr 2010 16:52:36 -0400
Date: Thu, 8 Apr 2010 23:48:56 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100408204856.GC6044@redhat.com>
References: <20100408204950.GD25347@amt.cnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100408204950.GD25347@amt.cnet>
Subject: [Qemu-devel] Re: vhost.c: include <linux/vhost.h> last
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: qemu-devel@nongnu.org

On Thu, Apr 08, 2010 at 05:49:50PM -0300, Marcelo Tosatti wrote:
> 
> So the userspace headers define KERNEL_STRICT_NAMES and there's no
> conflict on type definition for older kernels.
> 
> igned-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> diff --git a/hw/vhost.c b/hw/vhost.c
> index ad2f98a..d37a66e 100644
> --- a/hw/vhost.c
> +++ b/hw/vhost.c
> @@ -10,13 +10,13 @@
>   * the COPYING file in the top-level directory.
>   */
>  
> -#include <linux/vhost.h>
>  #include <sys/ioctl.h>
>  #include <sys/eventfd.h>
>  #include "vhost.h"
>  #include "hw/hw.h"
>  /* For range_get_last */
>  #include "pci.h"
> +#include <linux/vhost.h>
>  
>  static void vhost_dev_sync_region(struct vhost_dev *dev,
>                                    uint64_t mfirst, uint64_t mlast,