vnc: use stubs for CONFIG_VNC=n dummy functions
PATCH v2 1/1 vnc: use stubs for CONFIG_VNC=n dummy functions
Cc Paolo Bonzini <[email protected]>
Cc Markus Armbruster <[email protected]>
Signed-off-by Gerd Hoffmann <[email protected]>
--- 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
include/ui/console.h +0 -21
@@ -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
ui/vnc-stubs.c new file +21 -0
@@ -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 ; +}
ui/Makefile.objs +1 -0
@@ -15,6 +15,7 @@ common-obj-$(CONFIG_SDL) += sdl.mo common-obj-$(CONFIG_COCOA) += cocoa.o common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) +common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o common-obj-$(CONFIG_GTK) += gtk.o common-obj-$(if $(CONFIG_WIN32),n,$(if $(CONFIG_SDL),y,$(CONFIG_GTK))) += x_keymap.o
Signature · 1 line
2.9.3
I took the liberty to pick this into my "[PULL 00/20] Miscellaneous patches for 2018-02-07", because there's a semantic dependence between one of its patches an this one. Hope that's okay.