qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Leon Alrae <leon.alrae@imgtec.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.williamson@redhat.com,
	eric.auger@linaro.org
Subject: [Qemu-devel] [PATCH] vfio: fix build error on CentOS 5.7
Date: Wed, 17 Jun 2015 13:35:00 +0100	[thread overview]
Message-ID: <1434544500-22405-1-git-send-email-leon.alrae@imgtec.com> (raw)

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.

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"

             reply	other threads:[~2015-06-17 12:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-17 12:35 Leon Alrae [this message]
2015-06-17 12:47 ` [Qemu-devel] [PATCH] vfio: fix build error on CentOS 5.7 Eric Auger
2015-06-17 14:47 ` Alex Williamson
2015-06-18 10:23   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434544500-22405-1-git-send-email-leon.alrae@imgtec.com \
    --to=leon.alrae@imgtec.com \
    --cc=alex.williamson@redhat.com \
    --cc=eric.auger@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).