|
 |
619821 |
From a88811fcdd3dbc600a669eed0b106a5bf8f6b907 Mon Sep 17 00:00:00 2001
|
|
|
619821 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
619821 |
Date: Wed, 31 May 2017 08:09:49 +0200
|
|
|
b28c64 |
Subject: [PATCH] spice: fix spice_chr_add_watch() pre-condition
|
|
|
b28c64 |
MIME-Version: 1.0
|
|
|
b28c64 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b28c64 |
Content-Transfer-Encoding: 8bit
|
|
|
b28c64 |
|
|
|
619821 |
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
619821 |
Message-id: <20170531080949.17102-1-marcandre.lureau@redhat.com>
|
|
|
619821 |
Patchwork-id: 75440
|
|
|
619821 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH] spice: fix spice_chr_add_watch() pre-condition
|
|
|
619821 |
Bugzilla: 1456983
|
|
|
619821 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
b28c64 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
619821 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
b28c64 |
|
|
|
b28c64 |
From: Marc-André Lureau <marcandre.lureau@gmail.com>
|
|
|
b28c64 |
|
|
|
b28c64 |
Since e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3, add_watch() is called
|
|
|
b28c64 |
with G_IO_HUP. Even if spice-qemu-char ignores this flag, the
|
|
|
b28c64 |
precondition must be changed.
|
|
|
b28c64 |
|
|
|
b28c64 |
https://bugzilla.redhat.com/show_bug.cgi?id=1128992
|
|
|
b28c64 |
|
|
|
b28c64 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
619821 |
|
|
|
619821 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1456983
|
|
|
619821 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=13310981
|
|
|
619821 |
|
|
|
619821 |
"serial: poll the serial console with G_IO_HUP" was backported without
|
|
|
619821 |
the Spice related fix.
|
|
|
619821 |
|
|
|
b28c64 |
(cherry picked from commit f7a8beb5e6a13dc924895244777d9ef08b23b367)
|
|
|
619821 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
b28c64 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
b28c64 |
---
|
|
|
b28c64 |
spice-qemu-char.c | 2 +-
|
|
|
b28c64 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
b28c64 |
|
|
|
b28c64 |
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
|
|
|
619821 |
index cd51f3c..02c568c 100644
|
|
|
b28c64 |
--- a/spice-qemu-char.c
|
|
|
b28c64 |
+++ b/spice-qemu-char.c
|
|
|
619821 |
@@ -170,7 +170,7 @@ static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond)
|
|
|
b28c64 |
SpiceCharDriver *scd = chr->opaque;
|
|
|
b28c64 |
SpiceCharSource *src;
|
|
|
b28c64 |
|
|
|
b28c64 |
- assert(cond == G_IO_OUT);
|
|
|
b28c64 |
+ assert(cond & G_IO_OUT);
|
|
|
b28c64 |
|
|
|
b28c64 |
src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs,
|
|
|
b28c64 |
sizeof(SpiceCharSource));
|
|
|
b28c64 |
--
|
|
|
b28c64 |
1.8.3.1
|
|
|
b28c64 |
|