shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-26 14:50:11 +03:00
Code Issues Projects Releases Wiki Activity

virt-viewer: ensure we close when seeing domain stop event

Browse Source 
Normally virt-viewer relies on the VNC/SPICE widget seeing
an EOF on its underlying connection to detect when the
session is closed.

When tunnelling to a remote guest over SSH though, this
EOF can be delayed for a very long time, leaving a dead
session open.

This can be seen with

   virt-viewer -c qemu+ssh://remotehost/system guestname

when on the remote shell run

   virsh destroy guestname

and notice that virt-viewer does not see the shutdown
immediately.

When we get a domain stopped event we know the session
should be dead, so forceably close it, if not already
closed.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit a62827d28c6b69e90102e4c1c8043cbddad8929a)
This commit is contained in:
Daniel P. Berrange 2016-07-12 11:27:09 +01:00
parent 462d6de06a
commit 809d9f22a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/virt-viewer.c
View File

@ -577,6 +577,7 @@ virt_viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED,
{
VirtViewer *self = opaque;
VirtViewerApp *app = VIRT_VIEWER_APP(self);
VirtViewerSession *session;
GError *error = NULL;
g_debug("Got domain event %d %d", event, detail);
@ -586,7 +587,9 @@ virt_viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED,
switch (event) {
case VIR_DOMAIN_EVENT_STOPPED:
//virt_viewer_deactivate(self);
session = virt_viewer_app_get_session(app);
if (session != NULL)
virt_viewer_session_close(session);
break;
case VIR_DOMAIN_EVENT_STARTED: