Re: [Qemu-devel] [PATCH] vnc: use stubs for CONFIG_VNC=n dummy functions

[Paolo Bonzini]

On 01/02/2018 03:45, Gerd Hoffmann wrote:
> Cc: Markus Armbruster <address@hidden>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  include/ui/console.h | 21 ---------------------
>  ui/vnc-stubs.c       | 21 +++++++++++++++++++++
>  ui/Makefile.objs     |  1 +
>  3 files changed, 22 insertions(+), 21 deletions(-)
>  create mode 100644 ui/vnc-stubs.c
> 
> diff --git a/include/ui/console.h b/include/ui/console.h
> index 7b35778444..de57e8363a 100644
> --- a/include/ui/console.h
> +++ b/include/ui/console.h
> @@ -468,31 +468,10 @@ static inline void cocoa_display_init(DisplayState *ds, 
> int full_screen)
>  void vnc_display_init(const char *id);
>  void vnc_display_open(const char *id, Error **errp);
>  void vnc_display_add_client(const char *id, int csock, bool skipauth);
> -#ifdef CONFIG_VNC
>  int vnc_display_password(const char *id, const char *password);
>  int vnc_display_pw_expire(const char *id, time_t expires);
>  QemuOpts *vnc_parse(const char *str, Error **errp);
>  int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);
> -#else
> -static inline int vnc_display_password(const char *id, const char *password)
> -{
> -    return -ENODEV;
> -}
> -static inline int vnc_display_pw_expire(const char *id, time_t expires)
> -{
> -    return -ENODEV;
> -};
> -static inline QemuOpts *vnc_parse(const char *str, Error **errp)
> -{
> -    error_setg(errp, "VNC support is disabled");
> -    return NULL;
> -}
> -static inline int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
> -{
> -    error_setg(errp, "VNC support is disabled");
> -    return -1;
> -}
> -#endif
>  
>  /* curses.c */
>  #ifdef CONFIG_CURSES
> diff --git a/ui/vnc-stubs.c b/ui/vnc-stubs.c
> new file mode 100644
> index 0000000000..f51280549a
> --- /dev/null
> +++ b/ui/vnc-stubs.c
> @@ -0,0 +1,21 @@
> +#include "qemu/osdep.h"
> +#include "ui/console.h"
> +
> +int vnc_display_password(const char *id, const char *password)
> +{
> +    return -ENODEV;
> +}
> +int vnc_display_pw_expire(const char *id, time_t expires)
> +{
> +    return -ENODEV;
> +};
> +QemuOpts *vnc_parse(const char *str, Error **errp)
> +{
> +    error_setg(errp, "VNC support is disabled");
> +    return NULL;
> +}
> +int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
> +{
> +    error_setg(errp, "VNC support is disabled");
> +    return -1;
> +}
> diff --git a/ui/Makefile.objs b/ui/Makefile.objs
> index 99195884b0..09a275aed1 100644
> --- a/ui/Makefile.objs
> +++ b/ui/Makefile.objs
> @@ -6,6 +6,7 @@ vnc-obj-y += vnc-auth-vencrypt.o
>  vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
>  vnc-obj-y += vnc-ws.o
>  vnc-obj-y += vnc-jobs.o
> +stub-obj-y += vnc-stubs.o

Better, since vnc need not be linked into tools or user-mode emulation:

common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o

Paolo

>  common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o
>  common-obj-y += input.o input-keymap.o input-legacy.o
>