Re: [Qemu-devel] [PATCH v4 37/51] qapi: add conditions to VNC type/commands/events on the schema

[Marc-André Lureau]

Hi

----- Original Message -----
> > diff --git a/ui/vnc.h b/ui/vnc.h
> > index 694cf32ca9..5572bfdc9e 100644
> > --- a/ui/vnc.h
> > +++ b/ui/vnc.h
> > @@ -291,7 +291,9 @@ struct VncState
> >      bool encode_ws;
> >      bool websocket;
> >  
> > +#ifdef CONFIG_VNC
> >      VncClientInfo *info;
> > +#endif
> 
> Is this header files used even on !vnc builds?

Yes, in qmp.c.

it looks like it is possible to cleanup the code to not include it (same for 
spice etc), but I would rather keep this for a future TODO.

> 
> > diff --git a/hmp.c b/hmp.c
> > index 2d72f94193..0612ddc621 100644
> > --- a/hmp.c
> > +++ b/hmp.c
> > @@ -613,6 +613,7 @@ void hmp_info_blockstats(Monitor *mon, const QDict
> > *qdict)
> >      qapi_free_BlockStatsList(stats_list);
> >  }
> >  
> > +#ifdef CONFIG_VNC
> >  /* Helper for hmp_info_vnc_clients, _servers */
> >  static void hmp_info_VncBasicInfo(Monitor *mon, VncBasicInfo *info,
> >                                    const char *name)
> > @@ -700,6 +701,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
> >      qapi_free_VncInfo2List(info2l);
> >  
> >  }
> > +#endif
> 
> Move to ui/vnc.c, so we don't need #ifdef here?

Not so simple either. hmp-commands-info.h (needed for the function declaration) 
is built per target, but not ui/vnc.c. Again, some future cleanup?

thanks