From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbUXh-00011x-00 for qemu-devel@nongnu.org; Mon, 14 Sep 2015 10:15:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbUXb-0002T4-1Q for qemu-devel@nongnu.org; Mon, 14 Sep 2015 10:15:36 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:24530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbUXa-0002SN-Rj for qemu-devel@nongnu.org; Mon, 14 Sep 2015 10:15:30 -0400 From: Leon Alrae Date: Mon, 14 Sep 2015 15:15:10 +0100 Message-ID: <1442240110-26006-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] vfio: change the order of includes to fix build on CentOS 5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, alex.williamson@redhat.com 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 =E2=80=98dev_t=E2= =80=99 /usr/include/linux/types.h:13: error: previous declaration of =E2=80=98d= ev_t=E2=80=99 was here /usr/include/sys/stat.h:92: error: conflicting types for =E2=80=98blkcnt= _t=E2=80=99 /usr/include/linux/types.h:114: error: previous declaration of =E2=80=98= blkcnt_t=E2=80=99 was here In file included from /work/qemu/hw/vfio/pci.c:25: /usr/include/sys/types.h:46: error: conflicting types for =E2=80=98loff_= t=E2=80=99 /usr/include/linux/types.h:30: error: previous declaration of =E2=80=98l= off_t=E2=80=99 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 --- 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 (muli@il.ibm.com) */ =20 -#include #include +#include #include #include #include --=20 2.1.0