From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@gmail.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 4/4] spice: fix spice_chr_add_watch() pre-condition
Date: Fri, 29 May 2015 10:26:18 +0200 [thread overview]
Message-ID: <1432887978-7411-5-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1432887978-7411-1-git-send-email-kraxel@redhat.com>
From: Marc-André Lureau <marcandre.lureau@gmail.com>
Since e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3, add_watch() is called
with G_IO_HUP. Even if spice-qemu-char ignores this flag, the
precondition must be changed.
https://bugzilla.redhat.com/show_bug.cgi?id=1128992
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
spice-qemu-char.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 0f8903e..d41bb74 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -172,7 +172,7 @@ static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond)
SpiceCharDriver *scd = chr->opaque;
SpiceCharSource *src;
- assert(cond == G_IO_OUT);
+ assert(cond & G_IO_OUT);
src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs,
sizeof(SpiceCharSource));
--
1.8.3.1
next prev parent reply other threads:[~2015-05-29 8:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 8:26 [Qemu-devel] [PULL 0/4] spice patch queue Gerd Hoffmann
2015-05-29 8:26 ` [Qemu-devel] [PULL 1/4] virtio-console: notify chardev when writable Gerd Hoffmann
2015-05-29 8:26 ` [Qemu-devel] [PULL 2/4] spice-char: notify the server when chardev is writable Gerd Hoffmann
2015-05-29 8:26 ` [Qemu-devel] [PULL 3/4] spice: don't update mm_time when spice-server is stopped Gerd Hoffmann
2015-05-29 8:26 ` Gerd Hoffmann [this message]
2015-05-29 10:22 ` [Qemu-devel] [PULL 0/4] spice patch queue Peter Maydell
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=1432887978-7411-5-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=qemu-devel@nongnu.org \
/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).