From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56092)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eric.auger@linaro.org>) id 1Z5ClE-0004w0-J9
	for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:48:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eric.auger@linaro.org>) id 1Z5ClA-0001ry-Et
	for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:48:08 -0400
Received: from mail-wg0-f41.google.com ([74.125.82.41]:34036)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eric.auger@linaro.org>) id 1Z5ClA-0001ri-9C
	for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:48:04 -0400
Received: by wgv5 with SMTP id 5so36135765wgv.1
	for <qemu-devel@nongnu.org>; Wed, 17 Jun 2015 05:48:03 -0700 (PDT)
Message-ID: <55816C70.2070409@linaro.org>
Date: Wed, 17 Jun 2015 14:47:44 +0200
From: Eric Auger <eric.auger@linaro.org>
MIME-Version: 1.0
References: <1434544500-22405-1-git-send-email-leon.alrae@imgtec.com>
In-Reply-To: <1434544500-22405-1-git-send-email-leon.alrae@imgtec.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH] vfio: fix build error on CentOS 5.7
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Leon Alrae <leon.alrae@imgtec.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.williamson@redhat.com

Hi Leon,
On 06/17/2015 02:35 PM, Leon Alrae wrote:
> Include linux/vfio.h after sys/ioctl.h, just like in hw/vfio/common.c.
> 
> Signed-off-by: Leon Alrae <leon.alrae@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.
Sorry for the inconvenience and thanks for the correction.

Best Regards

Eric
> 
> 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"
>