From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 8 Apr 2010 20:49:50 +0000 (-0300)
Subject: vhost.c: include <linux/vhost.h> last
X-Git-Tag: v0.13.0-rc0~805
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=11078ae37f71eb64b4e1406af868a21ea676f184;p=qemu.git

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

So the userspace headers define KERNEL_STRICT_NAMES and there's no
conflict on type definition for older kernels.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/vhost.c b/hw/vhost.c
index ad2f98a8a..d37a66e0e 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,