From: Leon Alrae <leon.alrae@imgtec.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.williamson@redhat.com
Subject: [Qemu-devel] [PATCH] vfio: change the order of includes to fix build on CentOS 5
Date: Mon, 14 Sep 2015 15:15:10 +0100 [thread overview]
Message-ID: <1442240110-26006-1-git-send-email-leon.alrae@imgtec.com> (raw)
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 ‘dev_t’
/usr/include/linux/types.h:13: error: previous declaration of ‘dev_t’ was here
/usr/include/sys/stat.h:92: error: conflicting types for ‘blkcnt_t’
/usr/include/linux/types.h:114: error: previous declaration of ‘blkcnt_t’ was here
In file included from /work/qemu/hw/vfio/pci.c:25:
/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
In file included from /usr/include/sys/types.h:133,
from /work/qemu/hw/vfio/pci.c:25:
...
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---
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)
*/
-#include <linux/vfio.h>
#include <sys/ioctl.h>
+#include <linux/vfio.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
--
2.1.0
next reply other threads:[~2015-09-14 14:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-14 14:15 Leon Alrae [this message]
2015-09-14 15:59 ` [Qemu-devel] [PATCH] vfio: change the order of includes to fix build on CentOS 5 Eric Blake
2015-09-14 16:04 ` 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=1442240110-26006-1-git-send-email-leon.alrae@imgtec.com \
--to=leon.alrae@imgtec.com \
--cc=alex.williamson@redhat.com \
--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).