From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O1oNa-0002Sj-Lk
	for qemu-devel@nongnu.org; Tue, 13 Apr 2010 18:14:46 -0400
Received: from [140.186.70.92] (port=45375 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O1oNZ-0002Ru-DO
	for qemu-devel@nongnu.org; Tue, 13 Apr 2010 18:14:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1O1oLG-0005V3-SL
	for qemu-devel@nongnu.org; Tue, 13 Apr 2010 18:12:24 -0400
Received: from hall.aurel32.net ([88.191.82.174]:49145)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <aurelien@aurel32.net>) id 1O1oLG-0005Uv-LW
	for qemu-devel@nongnu.org; Tue, 13 Apr 2010 18:12:22 -0400
Date: Wed, 14 Apr 2010 00:12:19 +0200
From: Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] Re: vhost.c: include <linux/vhost.h> last
Message-ID: <20100413221218.GD24116@volta.aurel32.net>
References: <20100408204950.GD25347@amt.cnet>
	<20100408204856.GC6044@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
In-Reply-To: <20100408204856.GC6044@redhat.com>
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: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org

On Thu, Apr 08, 2010 at 11:48:56PM +0300, Michael S. Tsirkin wrote:
> 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>

Thanks, applied.

> > 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,
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net