Re: [Qemu-devel] [PATCH 1/2] Introduce compiler.h header file

[Luiz Capitulino <lcapitulino@redhat.com>]

On Wed, 13 Jul 2011 00:43:42 +0400 (MSD)
malc <av1474@comtv.ru> wrote:

> On Tue, 12 Jul 2011, Luiz Capitulino wrote:
> 
> > On Wed, 13 Jul 2011 00:31:56 +0400 (MSD)
> > malc <av1474@comtv.ru> wrote:
> > 
> > > On Tue, 12 Jul 2011, Luiz Capitulino wrote:
> > > 
> > > > From: Luiz Capitulino <lcapitulino@gmail.com>
> > > > 
> > > > This moves compiler related macros from qemu-common.h to compiler.h.
> > > > 
> > > > The reason for this change is that there are simple header files that
> > > > depend only on the compiler macros, so including qemu-common.h is overkill.
> > > > 
> > > > Besides, qemu-common.h is bloated and will benefit from some splitting.
> > > > 
> > > > Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
> > > > ---
> > > >  compiler.h    |   38 ++++++++++++++++++++++++++++++++++++++
> > > >  qemu-common.h |   25 +------------------------
> > > >  2 files changed, 39 insertions(+), 24 deletions(-)
> > > >  create mode 100644 compiler.h
> > > > 
> > > > diff --git a/compiler.h b/compiler.h
> > > > new file mode 100644
> > > > index 0000000..864f8ff
> > > > --- /dev/null
> > > > +++ b/compiler.h
> > > > @@ -0,0 +1,38 @@
> > > > +/*
> > > > + * Compiler related definition
> > > > + *
> > > > + * This work is licensed under the terms of the GNU GPL, version 2.  See
> > > > + * the COPYING file in the top-level directory.
> > > > + *
> > > > + */
> > > > +#ifndef COMPILER_H
> > > > +#define COMPILER_H
> > > > +
> > > > +#include "config-host.h"
> > > > +
> > > > +#define QEMU_NORETURN __attribute__ ((__noreturn__))
> > > > +#ifdef CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT
> > > > +#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
> > > > +#else
> > > > +#define QEMU_WARN_UNUSED_RESULT
> > > > +#endif
> > > > +
> > > > +#define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
> > > > +
> > > > +#if defined __GNUC__
> > > > +# if (__GNUC__ < 4) || \
> > > > +     defined(__GNUC_MINOR__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 4)
> > > > +   /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */
> > > > +#  define GCC_ATTR __attribute__((__unused__, format(printf, 1, 2)))
> > > > +#  define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m)))
> > > 
> > > I wrote the above and certainly didn't license it under GPL, please drop
> > > the bogus copyright notice at the top.
> > 
> > Which one should I use?
> 
> None, it's a bloody header with definitions it's not copyrightable.

It's, but you're choosing not to do so.

> 
> > 
> > > 
> > > > +# else
> > > > +   /* Use gnu_printf when supported (qemu uses standard format strings). */
> > > > +#  define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2)))
> > > > +#  define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))
> > > > +# endif
> > > > +#else
> > > > +#define GCC_ATTR /**/
> > > > +#define GCC_FMT_ATTR(n, m)
> > > > +#endif
> > > > +
> > > > +#endif /* COMPILER_H */
> > > > diff --git a/qemu-common.h b/qemu-common.h
> > > > index abd7a75..1e72931 100644
> > > > --- a/qemu-common.h
> > > > +++ b/qemu-common.h
> > > > @@ -2,16 +2,9 @@
> > > >  #ifndef QEMU_COMMON_H
> > > >  #define QEMU_COMMON_H
> > > >  
> > > > +#include "compiler.h"
> > > >  #include "config-host.h"
> > > >  
> > > > -#define QEMU_NORETURN __attribute__ ((__noreturn__))
> > > > -#ifdef CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT
> > > > -#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
> > > > -#else
> > > > -#define QEMU_WARN_UNUSED_RESULT
> > > > -#endif
> > > > -
> > > > -#define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
> > > >  #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
> > > >  
> > > >  typedef struct QEMUTimer QEMUTimer;
> > > > @@ -82,22 +75,6 @@ struct iovec {
> > > >  #include <sys/uio.h>
> > > >  #endif
> > > >  
> > > > -#if defined __GNUC__
> > > > -# if (__GNUC__ < 4) || \
> > > > -     defined(__GNUC_MINOR__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 4)
> > > > -   /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */
> > > > -#  define GCC_ATTR __attribute__((__unused__, format(printf, 1, 2)))
> > > > -#  define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m)))
> > > > -# else
> > > > -   /* Use gnu_printf when supported (qemu uses standard format strings). */
> > > > -#  define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2)))
> > > > -#  define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m)))
> > > > -# endif
> > > > -#else
> > > > -#define GCC_ATTR /**/
> > > > -#define GCC_FMT_ATTR(n, m)
> > > > -#endif
> > > > -
> > > >  typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
> > > >      GCC_FMT_ATTR(2, 3);
> > > >  
> > > > 
> > > 
> > 
>