[Qemu-devel] [PATCH] compiler.h include fix for usb-linux.c

[Qemu-devel] [PATCH] compiler.h include fix for usb-linux.c

[( अमेय पाळंदे ) Ameya Palande]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

Hi,

Redhat and its derivatives don't have /usr/include/linux/compiler.h
But debian, opensuse etc. have compiler.h

Without including compiler.h in usb-linux.c build fails on opensuse.

So instead of removing compiler.h, its better to check if it is there
on build host and if it is there then include it.

patch is made against qemu-snapshot-2007-01-10_05

Regards,
Ameya.

[-- Attachment #2: compiler-h-fix.patch --]
[-- Type: text/x-patch, Size: 1010 bytes --]

diff -ur qemu-snapshot-2007-01-10_05/configure qemu-snapshot-2007-01-10_05.new/configure
--- qemu-snapshot-2007-01-10_05/configure	2007-01-05 22:25:54.000000000 +0100
+++ qemu-snapshot-2007-01-10_05.new/configure	2007-01-10 20:41:08.000000000 +0100
@@ -749,7 +749,9 @@
 if [ "$build_docs" = "yes" ] ; then
   echo "BUILD_DOCS=yes" >> $config_mak
 fi
-
+if test -f "/usr/include/linux/compiler.h" ; then
+  echo "#define HAVE_COMPILER_H 1" >> $config_h
+fi
 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
   echo "#define O_LARGEFILE 0" >> $config_h
diff -ur qemu-snapshot-2007-01-10_05/usb-linux.c qemu-snapshot-2007-01-10_05.new/usb-linux.c
--- qemu-snapshot-2007-01-10_05/usb-linux.c	2006-12-10 23:11:04.000000000 +0100
+++ qemu-snapshot-2007-01-10_05.new/usb-linux.c	2007-01-10 20:34:08.000000000 +0100
@@ -24,6 +24,9 @@
 #include "vl.h"
 
 #if defined(__linux__)
+#ifdef HAVE_COMPILER_H
+#include <linux/compiler.h>
+#endif
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <linux/usbdevice_fs.h>

Re: [Qemu-devel] [PATCH] compiler.h include fix for usb-linux.c

[Thiemo Seufer]

( ???????????? ?????????????????? ) Ameya Palande wrote:
> Hi,
> 
> Redhat and its derivatives don't have /usr/include/linux/compiler.h
> But debian, opensuse etc. have compiler.h
> 
> Without including compiler.h in usb-linux.c build fails on opensuse.

JFTR, it works on debian.


Thiemo

Re: [Qemu-devel] [PATCH] compiler.h include fix for usb-linux.c

[( अमेय पाळंदे ) Ameya Palande]

On 1/10/07, Thiemo Seufer <ths@networkno.de> wrote:
> ( ???????????? ?????????????????? ) Ameya Palande wrote:
> > Hi,
> >
> > Redhat and its derivatives don't have /usr/include/linux/compiler.h
> > But debian, opensuse etc. have compiler.h
> >
> > Without including compiler.h in usb-linux.c build fails on opensuse.
>
> JFTR, it works on debian.
>
>
> Thiemo
>

It works on debian because on debian /usr/include/linux/usbdevice_fs.h file
includes <linux/compiler.h>

Regards,
Ameya.

Re: [Qemu-devel] [PATCH] compiler.h include fix for usb-linux.c

[Lonnie Mendez]

On Thu, 2007-01-11 at 00:00 +0100, ( अमेय पाळंदे ) Ameya Palande wrote:
> On 1/10/07, Thiemo Seufer <ths@networkno.de> wrote:
> > ( ???????????? ?????????????????? ) Ameya Palande wrote:
> > > Hi,
> > >
> > > Redhat and its derivatives don't have /usr/include/linux/compiler.h
> > > But debian, opensuse etc. have compiler.h
> > >
> > > Without including compiler.h in usb-linux.c build fails on opensuse.
> >
> > JFTR, it works on debian.
> >
> >
> > Thiemo
> >
> 
> It works on debian because on debian /usr/include/linux/usbdevice_fs.h file
> includes <linux/compiler.h>

The issue before is that usb-linux.c should not be including
linux/compiler.h.  See the xen approach to fixing this for the broken
distros:

http://xenbits2.xensource.com/xen-unstable.hg?rev/ba7487569374;style=rev
%3Dusb