From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehAVB-00011D-80 for qemu-devel@nongnu.org; Thu, 01 Feb 2018 03:45:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehAV3-0004BX-Lb for qemu-devel@nongnu.org; Thu, 01 Feb 2018 03:45:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31595) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehAV3-0004B7-GE for qemu-devel@nongnu.org; Thu, 01 Feb 2018 03:45:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 920205AFC4 for ; Thu, 1 Feb 2018 08:45:40 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 1 Feb 2018 09:45:35 +0100 Message-Id: <20180201084535.26721-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] vnc: use stubs for CONFIG_VNC=n dummy functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Markus Armbruster Cc: Markus Armbruster Signed-off-by: Gerd Hoffmann --- 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 common-obj-y += keymaps.o console.o cursor.o qemu-pixman.o common-obj-y += input.o input-keymap.o input-legacy.o -- 2.9.3