]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
spice: fix spice_chr_add_watch() pre-condition
authorMarc-André Lureau <marcandre.lureau@gmail.com>
Thu, 28 May 2015 13:04:58 +0000 (15:04 +0200)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 20 Jul 2015 11:20:47 +0000 (11:20 +0000)
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

upstream-commit-id: f7a8beb5e6a13dc924895244777d9ef08b23b367

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
spice-qemu-char.c

index 66245599524ce0dec70be2b1315d359fbf0569a4..99eb1bf6b146ea1b447dd8c04e16f1a7b70d27de 100644 (file)
@@ -170,7 +170,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));