From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Eca-0007MF-8S for qemu-devel@nongnu.org; Wed, 17 Jun 2015 10:47:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5EcU-0001gO-HU for qemu-devel@nongnu.org; Wed, 17 Jun 2015 10:47:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5EcU-0001gH-BV for qemu-devel@nongnu.org; Wed, 17 Jun 2015 10:47:14 -0400 Message-ID: <1434552432.5628.8.camel@redhat.com> From: Alex Williamson Date: Wed, 17 Jun 2015 08:47:12 -0600 In-Reply-To: <1434544500-22405-1-git-send-email-leon.alrae@imgtec.com> References: <1434544500-22405-1-git-send-email-leon.alrae@imgtec.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] vfio: fix build error on CentOS 5.7 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Leon Alrae Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, eric.auger@linaro.org On Wed, 2015-06-17 at 13:35 +0100, Leon Alrae wrote: > Include linux/vfio.h after sys/ioctl.h, just like in hw/vfio/common.c. >=20 > Signed-off-by: Leon Alrae > --- > CentOS 5 is one of hosts I still use. For building I already provide cu= stom > GLib to satisfy version 2.22 dependency. However, with commit 0ea2730b = QEMU > doesn't build on CentOS 5.7: >=20 > 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 =E2=80=98loff= _t=E2=80=99 > /usr/include/linux/types.h:30: error: previous declaration of =E2=80=98= loff_t=E2=80=99 was here > /usr/include/sys/types.h:62: error: conflicting types for =E2=80=98dev_= t=E2=80=99 > /usr/include/linux/types.h:13: error: previous declaration of =E2=80=98= dev_t=E2=80=99 was here > ... >=20 > And this patch fixes above problem. >=20 > Leon > --- > hw/vfio/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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 > */ > =20 > -#include > #include > +#include > =20 > #include "hw/vfio/vfio-platform.h" > #include "qemu/error-report.h" Thanks for the patch. Peter, if you want to pop this in as a build fix, I'd welcome it. Otherwise I can take it the normal route. Thanks. Acked-by: Alex Williamson