| Message ID | 1442240110-26006-1-git-send-email-leon.alrae@imgtec.com |
|---|---|
| State | New |
| Headers | show |
On 09/14/2015 08:15 AM, Leon Alrae wrote: > 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: How much longer are we planning on building on CentOS 5? Didn't we already break things with a glib minimum requirement in qemu 2.5, plus the now-pending bump to python 2.6? While I'm not opposed to this patch, I'm wondering if it will make any real difference.
On 14 September 2015 at 16:59, Eric Blake <eblake@redhat.com> wrote: > On 09/14/2015 08:15 AM, Leon Alrae wrote: >> 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: > > How much longer are we planning on building on CentOS 5? Didn't we > already break things with a glib minimum requirement in qemu 2.5, plus > the now-pending bump to python 2.6? It's not supported by us (upstream) any more (since 2.4). > While I'm not opposed to this patch, I'm wondering if it will make any > real difference. Anybody wanting to build on Centos 5 is going to need to start building/backporting their dependent libraries and build tools, yes. But where the changes to fix compilation issues are trivial, like this one, I don't see any reason for us not to accept them. thanks -- PMM
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>
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(-)