From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkN-0002hs-89 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkK-0007as-24 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkJ-0007ao-O9 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:39 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55F5485365 for ; Tue, 19 Apr 2016 19:55:39 +0000 (UTC) From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:18 -0300 Message-Id: <1461095728-22055-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> References: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 v3 02/12] vnc: Initialization stubs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum This reduces the number of CONFIG_VNC #ifdefs in the vl.c code. The only user-visible difference is that this will make QEMU complain about syntax when using "-display vnc" ("VNC requires a display argument vnc=") even if CONFIG_VNC is disabled. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Move stub file to stubs/ui/ Changes v2 -> v3: * Move stubs to header file --- include/ui/console.h | 20 +++++++++++++++++++- vl.c | 15 +-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index d5a88d9..6640348 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -6,6 +6,8 @@ #include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qapi-types.h" +#include "qemu/error-report.h" +#include "qapi/error.h" #ifdef CONFIG_OPENGL # include @@ -430,10 +432,10 @@ 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); -char *vnc_display_local_addr(const char *id); #ifdef CONFIG_VNC int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); +char *vnc_display_local_addr(const char *id); QemuOpts *vnc_parse(const char *str, Error **errp); int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); #else @@ -445,6 +447,22 @@ 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; +} +static inline char *vnc_display_local_addr(const char *id) +{ + /* This must never be called if CONFIG_VNC is disabled */ + error_report("VNC support is disabled"); + abort(); +} #endif /* curses.c */ diff --git a/vl.c b/vl.c index a920f16..cdb06dc 100644 --- a/vl.c +++ b/vl.c @@ -2146,7 +2146,6 @@ static DisplayType select_display(const char *p) exit(1); #endif } else if (strstart(p, "vnc", &opts)) { -#ifdef CONFIG_VNC if (*opts == '=') { Error *err = NULL; if (vnc_parse(opts + 1, &err) == NULL) { @@ -2157,10 +2156,6 @@ static DisplayType select_display(const char *p) error_report("VNC requires a display argument vnc="); exit(1); } -#else - error_report("VNC support is disabled"); - exit(1); -#endif } else if (strstart(p, "curses", &opts)) { #ifdef CONFIG_CURSES display = DT_CURSES; @@ -2964,9 +2959,7 @@ int main(int argc, char **argv, char **envp) const char *qtest_log = NULL; const char *pid_file = NULL; const char *incoming = NULL; -#ifdef CONFIG_VNC int show_vnc_port = 0; -#endif bool defconfig = true; bool userconfig = true; const char *log_mask = NULL; @@ -3713,17 +3706,12 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_vnc: { -#ifdef CONFIG_VNC Error *local_err = NULL; if (vnc_parse(optarg, &local_err) == NULL) { error_report_err(local_err); exit(1); } -#else - error_report("VNC support is disabled"); - exit(1); -#endif break; } case QEMU_OPTION_no_acpi: @@ -4578,7 +4566,6 @@ int main(int argc, char **argv, char **envp) /* must be after terminal init, SDL library changes signal handlers */ os_setup_signal_handling(); -#ifdef CONFIG_VNC /* init remote displays */ qemu_opts_foreach(qemu_find_opts("vnc"), vnc_init_func, NULL, NULL); @@ -4587,7 +4574,7 @@ int main(int argc, char **argv, char **envp) printf("VNC server running on '%s'\n", ret); g_free(ret); } -#endif + #ifdef CONFIG_SPICE if (using_spice) { qemu_spice_display_init(); -- 2.1.0