| From a88811fcdd3dbc600a669eed0b106a5bf8f6b907 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> |
| Date: Wed, 31 May 2017 08:09:49 +0200 |
| Subject: [PATCH] spice: fix spice_chr_add_watch() pre-condition |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Message-id: <20170531080949.17102-1-marcandre.lureau@redhat.com> |
| Patchwork-id: 75440 |
| O-Subject: [RHEL-7.4 qemu-kvm PATCH] spice: fix spice_chr_add_watch() pre-condition |
| Bugzilla: 1456983 |
| RH-Acked-by: Fam Zheng <famz@redhat.com> |
| RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com> |
| RH-Acked-by: John Snow <jsnow@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> |
| |
| BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1456983 |
| Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=13310981 |
| |
| "serial: poll the serial console with G_IO_HUP" was backported without |
| the Spice related fix. |
| |
| (cherry picked from commit f7a8beb5e6a13dc924895244777d9ef08b23b367) |
| Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@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 cd51f3c..02c568c 100644 |
| |
| |
| @@ -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)); |
| -- |
| 1.8.3.1 |
| |