From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkX-00036m-H7 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkS-0007cw-H8 for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38724) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkS-0007cp-7f for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:48 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 D05F285366 for ; Tue, 19 Apr 2016 19:55:47 +0000 (UTC) From: Eduardo Habkost Date: Tue, 19 Apr 2016 16:55:23 -0300 Message-Id: <1461095728-22055-8-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 07/12] spice: Initialization stubs on qemu-spice.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum , Gerd Hoffmann This reduces the number of CONFIG_SPICE #ifdefs in vl.c. Cc: Gerd Hoffmann Reviewed-by: Gerd Hoffmann Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Move stubs to qemu-spice.h, as the header file already had a separate section for !CONFIG_SPICE --- include/ui/qemu-spice.h | 13 +++++++++++++ vl.c | 4 ---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index aa24363..57ac91b 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -51,6 +51,8 @@ static inline CharDriverState *qemu_chr_open_spice_port(const char *name) #else /* CONFIG_SPICE */ +#include "qemu/error-report.h" + #define using_spice 0 #define spice_displays 0 static inline int qemu_spice_set_passwd(const char *passwd, @@ -75,6 +77,17 @@ static inline int qemu_spice_display_add_client(int csock, int skipauth, return -1; } +static inline void qemu_spice_display_init(void) +{ + /* This must never be called if CONFIG_SPICE is disabled */ + error_report("spice support is disabled"); + abort(); +} + +static inline void qemu_spice_init(void) +{ +} + #endif /* CONFIG_SPICE */ static inline bool qemu_using_spice(Error **errp) diff --git a/vl.c b/vl.c index 067d37e..732914b 100644 --- a/vl.c +++ b/vl.c @@ -4359,10 +4359,8 @@ int main(int argc, char **argv, char **envp) os_set_line_buffering(); -#ifdef CONFIG_SPICE /* spice needs the timers to be initialized by this point */ qemu_spice_init(); -#endif cpu_ticks_init(); if (icount_opts) { @@ -4564,11 +4562,9 @@ int main(int argc, char **argv, char **envp) g_free(ret); } -#ifdef CONFIG_SPICE if (using_spice) { qemu_spice_display_init(); } -#endif if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { exit(1); -- 2.1.0