Patchwork vhost.c: include <linux/vhost.h> last

login
register
mail settings
Submitter Marcelo Tosatti
Date April 8, 2010, 8:49 p.m.
Message ID <20100408204950.GD25347@amt.cnet>
Download mbox | patch
Permalink /patch/49767/
State New
Headers show

Comments

Marcelo Tosatti - April 8, 2010, 8:49 p.m.
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>
Aurelien Jarno - April 13, 2010, 10:12 p.m.
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,
> 
> 
>

Patch

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,