qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Hu Tao <hutao@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>,
	Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH v2] fixup! libqemustub: add more stubs for qemu-char
Date: Fri, 20 Jun 2014 14:31:04 +0800	[thread overview]
Message-ID: <1403245864-390-1-git-send-email-hutao@cn.fujitsu.com> (raw)
In-Reply-To: <1abfc782c70f4daa242128480cf6a594e081a61c.1403243169.git.hutao@cn.fujitsu.com>

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 <hutao@cn.fujitsu.com>
---
 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

  parent reply	other threads:[~2014-06-20  6:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-20  5:55 [Qemu-devel] [PATCH 0/3] another round of pci fixes Hu Tao
2014-06-20  5:55 ` [Qemu-devel] [PATCH 1/3] fixup! libqemustub: add more stubs for qemu-char Hu Tao
2014-06-20  6:03   ` Nikolay Nikolaev
2014-06-20  6:17     ` Hu Tao
2014-06-20  6:31   ` Hu Tao [this message]
2014-06-20  8:26   ` Peter Maydell
2014-06-20  8:29     ` Hu Tao
2014-06-20  5:55 ` [Qemu-devel] [PATCH 2/3] fixup! qapi/string-output-visitor: fix bugs Hu Tao
2014-06-20 15:34   ` Eric Blake
2014-06-20  5:55 ` [Qemu-devel] [PATCH 3/3] tests: add human format test for string output visitor Hu Tao
2014-06-20 15:40   ` Eric Blake
2014-06-22 10:11     ` Michael S. Tsirkin
2014-06-22  7:19 ` [Qemu-devel] [PATCH 0/3] another round of pci fixes Michael S. Tsirkin
2014-06-29 15:23 ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403245864-390-1-git-send-email-hutao@cn.fujitsu.com \
    --to=hutao@cn.fujitsu.com \
    --cc=mst@redhat.com \
    --cc=n.nikolaev@virtualopensystems.com \
    --cc=qemu-devel@nongnu.org \
    --cc=y-goto@jp.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).