Re: [Qemu-devel] [PATCH v6 01/26] qemu: add Error to typedefs

[Igor Mammedov]

On Mon, 30 Sep 2013 17:40:50 +0300
"Michael S. Tsirkin" <address@hidden> wrote:

> On Mon, Sep 30, 2013 at 03:10:56PM +0200, Igor Mammedov wrote:
> > On Sun, 29 Sep 2013 13:58:24 +0300
> > "Michael S. Tsirkin" <address@hidden> wrote:
> > 
> > > This is so qom headers can use it without pulling in
> > > extra headers.
> > > 
> > > Reviewed-by: Paolo Bonzini <address@hidden>
> > > Signed-off-by: Michael S. Tsirkin <address@hidden>
> > > ---
> > >  include/qemu/typedefs.h | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > index a4c1b84..46c3599 100644
> > > --- a/include/qemu/typedefs.h
> > > +++ b/include/qemu/typedefs.h
> > > @@ -7,6 +7,7 @@ typedef struct QEMUTimer QEMUTimer;
> > >  typedef struct QEMUTimerListGroup QEMUTimerListGroup;
> > >  typedef struct QEMUFile QEMUFile;
> > >  typedef struct QEMUBH QEMUBH;
> > > +typedef struct Error Error;
> > >  
> > >  typedef struct AioContext AioContext;
> > >  
> > 
> > fc19 seems to ok with it but rhel6/gcc-4.4.7-4 isn't
> > ./configure --enable-kvm --target-list=x86_64-softmmu,x86_64-linux-user
> > 
> > In file included from /qemu/include/qapi/visitor.h:18,
> >                  from qapi-visit.h:20,
> >                  from qapi-visit.c:18:
> > /qemu/include/qapi/error.h:23: error: redefinition of typedef ‘Error’
> > /qemu/include/qemu/typedefs.h:10: note: previous declaration of ‘Error’ was 
> > here
> 
> 
> Thanks, I'll move that out of qemu/error.h, applying
> the following on top should fix it, right?
Yep, it should, I've made a similar change to continue testing.

> 
> Signed-off-by: Michael S. Tsirkin <address@hidden>
> 
> --
> 
> diff --git a/include/qapi/error.h b/include/qapi/error.h
> index 7d4c696..b85e996 100644
> --- a/include/qapi/error.h
> +++ b/include/qapi/error.h
> @@ -13,14 +13,15 @@
>  #define ERROR_H
>  
>  #include "qemu/compiler.h"
> +#include "qemu/typedefs.h"
>  #include "qapi-types.h"
>  #include <stdbool.h>
>  
>  /**
> - * A class representing internal errors within QEMU.  An error has a 
> ErrorClass
> + * Error:
> + * An object representing internal errors within QEMU.  An error has a 
> ErrorClass
>   * code and a human message.
>   */
> -typedef struct Error Error;
>  
>  /**
>   * Set an indirect pointer to an error given a ErrorClass value and a