From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxsNp-0002hC-IJ for qemu-devel@nongnu.org; Fri, 20 Jun 2014 02:33:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxsNk-0000Ne-Ka for qemu-devel@nongnu.org; Fri, 20 Jun 2014 02:33:09 -0400 Received: from [59.151.112.132] (port=17831 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxsNk-0000NA-A8 for qemu-devel@nongnu.org; Fri, 20 Jun 2014 02:33:04 -0400 From: Hu Tao Date: Fri, 20 Jun 2014 14:31:04 +0800 Message-ID: <1403245864-390-1-git-send-email-hutao@cn.fujitsu.com> In-Reply-To: <1abfc782c70f4daa242128480cf6a594e081a61c.1403243169.git.hutao@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2] fixup! libqemustub: add more stubs for qemu-char List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Yasunori Goto , Nikolay Nikolaev , "Michael S. Tsirkin" build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this suppresses the warning when building without CONFIG_SPICE. Signed-off-by: Hu Tao --- stubs/Makefile.objs | 2 +- stubs/qemu-chr-open-spice.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) v2: - add version check for qemu_chr_open_spice_port() diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 2312076..03210ad 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -25,7 +25,7 @@ stub-obj-y += mon-set-error.o stub-obj-y += monitor-init.o stub-obj-y += notify-event.o stub-obj-y += pci-drive-hot-add.o -stub-obj-y += qemu-chr-open-spice.o +stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o stub-obj-y += qtest.o stub-obj-y += reset.o stub-obj-y += runstate-check.o diff --git a/stubs/qemu-chr-open-spice.c b/stubs/qemu-chr-open-spice.c index 40a29a9..f1c4849 100644 --- a/stubs/qemu-chr-open-spice.c +++ b/stubs/qemu-chr-open-spice.c @@ -6,7 +6,9 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type) return NULL; } +#if SPICE_SERVER_VERSION >= 0x000c02 CharDriverState *qemu_chr_open_spice_port(const char *name) { return NULL; } +#endif -- 1.9.3