Include linux/vfio.h after sys/ioctl.h, just like in hw/vfio/common.c. Signed-off-by: Leon Alrae <leon.al...@imgtec.com> --- CentOS 5 is one of hosts I still use. For building I already provide custom GLib to satisfy version 2.22 dependency. However, with commit 0ea2730b QEMU doesn't build on CentOS 5.7:
CC mips-softmmu/hw/vfio/platform.o In file included from /usr/include/stdlib.h:438, from /work/qemu/include/qemu-common.h:26, from /work/qemu/include/hw/hw.h:5, from /work/qemu/include/hw/qdev.h:4, from /work/qemu/include/hw/sysbus.h:6, from /work/qemu/include/hw/vfio/vfio-platform.h:19, from /work/qemu/hw/vfio/platform.c:20: /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 /usr/include/sys/types.h:62: error: conflicting types for ‘dev_t’ /usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here ... And this patch fixes above problem. Leon --- hw/vfio/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 9382bb7..5c678b9 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -14,8 +14,8 @@ * Copyright Red Hat, Inc. 2012 */ -#include <linux/vfio.h> #include <sys/ioctl.h> +#include <linux/vfio.h> #include "hw/vfio/vfio-platform.h" #include "qemu/error-report.h"