From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 05/15] char/spice: trigger HUP event
Date: Fri, 22 Feb 2019 08:53:16 +0100 [thread overview]
Message-ID: <20190222075326.9850-6-kraxel@redhat.com> (raw)
In-Reply-To: <20190222075326.9850-1-kraxel@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Inform the front-end of disconnected state (spice client
disconnected).
This will wakeup the source handler immediately, so it can detect the
disconnection asap.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Victor Toso <victortoso@redhat.com>
Message-id: 20190221110703.5775-2-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
chardev/spice.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/chardev/spice.c b/chardev/spice.c
index 173c257949c0..c2baeb5461fa 100644
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -148,15 +148,25 @@ static void vmc_unregister_interface(SpiceChardev *scd)
static gboolean spice_char_source_prepare(GSource *source, gint *timeout)
{
SpiceCharSource *src = (SpiceCharSource *)source;
+ Chardev *chr = CHARDEV(src->scd);
*timeout = -1;
+ if (!chr->be_open) {
+ return true;
+ }
+
return !src->scd->blocked;
}
static gboolean spice_char_source_check(GSource *source)
{
SpiceCharSource *src = (SpiceCharSource *)source;
+ Chardev *chr = CHARDEV(src->scd);
+
+ if (!chr->be_open) {
+ return true;
+ }
return !src->scd->blocked;
}
@@ -164,9 +174,12 @@ static gboolean spice_char_source_check(GSource *source)
static gboolean spice_char_source_dispatch(GSource *source,
GSourceFunc callback, gpointer user_data)
{
+ SpiceCharSource *src = (SpiceCharSource *)source;
+ Chardev *chr = CHARDEV(src->scd);
GIOFunc func = (GIOFunc)callback;
+ GIOCondition cond = chr->be_open ? G_IO_OUT : G_IO_HUP;
- return func(NULL, G_IO_OUT, user_data);
+ return func(NULL, cond, user_data);
}
static GSourceFuncs SpiceCharSourceFuncs = {
--
2.9.3
next prev parent reply other threads:[~2019-02-22 7:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 7:53 [Qemu-devel] [PULL 00/15] Ui 20190222 patches Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 01/15] kbd-state: don't block auto-repeat events Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 02/15] spice: set device address and device display ID in QXL interface Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 03/15] sdl2: drop qemu_input_event_send_key_qcode call Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 04/15] ui/gtk: Fix the license information Gerd Hoffmann
2019-02-22 7:53 ` Gerd Hoffmann [this message]
2019-02-22 7:53 ` [Qemu-devel] [PULL 06/15] char/spice: discard write() if backend is disconnected Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 08/15] spice: merge options lists Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 09/15] spice: do not stop spice if VM is paused Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port() to spice.h header Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 11/15] char: register spice ports after spice started Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 12/15] build-sys: add gio-2.0 check Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 13/15] qapi: document DisplayType enum Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 14/15] spice: use a default name for the server Gerd Hoffmann
2019-02-22 7:53 ` [Qemu-devel] [PULL 15/15] display: add -display spice-app launching a Spice client Gerd Hoffmann
2019-02-25 12:48 ` [Qemu-devel] [PULL 00/15] Ui 20190222 patches 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=20190222075326.9850-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.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).