[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] vfio: change the order of includes to fix build on
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PATCH] vfio: change the order of includes to fix build on CentOS 5 |
Date: |
Mon, 14 Sep 2015 15:15:10 +0100 |
Include linux/vfio.h after sys/ioctl.h, just like in hw/vfio/common.c and
hw/vfio/platform.c.
This fixes the regression caused by the change in commit d7646f2:
CC mips-softmmu/hw/vfio/pci.o
In file included from /work/qemu/hw/vfio/pci.c:24:
/usr/include/sys/stat.h:44: error: conflicting types for ‘dev_t’
/usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here
/usr/include/sys/stat.h:92: error: conflicting types for ‘blkcnt_t’
/usr/include/linux/types.h:114: error: previous declaration of ‘blkcnt_t’ was
here
In file included from /work/qemu/hw/vfio/pci.c:25:
/usr/include/sys/types.h:46: error: conflicting types for ‘loff_t’
/usr/include/linux/types.h:30: error: previous declaration of ‘loff_t’ was here
In file included from /usr/include/sys/types.h:133,
from /work/qemu/hw/vfio/pci.c:25:
...
Signed-off-by: Leon Alrae <address@hidden>
---
hw/vfio/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 73d34b9..5f74fbe 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -18,8 +18,8 @@
* Copyright (C) 2008, IBM, Muli Ben-Yehuda (address@hidden)
*/
-#include <linux/vfio.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
--
2.1.0
- [Qemu-devel] [PATCH] vfio: change the order of includes to fix build on CentOS 5,
Leon Alrae <=