vnc: use stubs for CONFIG_VNC=n dummy functions
PATCH 1/1 vnc: use stubs for CONFIG_VNC=n dummy functions
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
@@ -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 common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o common-obj-y += input.o input-keymap.o input-legacy.o
Signature · 1 line
2.9.3
Quoted 8 lines · Gerd Hoffmann
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
Reviewed-by Daniel P. Berrange <[email protected]>
Quoted 80 lines
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@@ -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 common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o common-obj-y += input.o input-keymap.o input-legacy.oSignature · 1 line
2.9.3
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 2 lines · Gerd Hoffmann
Cc Markus Armbruster <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>
Cool!
Reviewed-by Markus Armbruster <[email protected]>
Quoted 77 lines · Gerd Hoffmann
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.cinclude/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 +0
-0
ui/Makefile.objs vnc-obj-y += vnc-auth-vencrypt.o · line 9
Quoted 4 lines
ui/Makefile.objs +1
-0@@ -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
Quoted 3 lines
ui/Makefile.objs +0
-0common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o common-obj-y += input.o input-keymap.o input-legacy.o