|
 |
eec4b3 |
From b8ca721ecbf0b5c85bbac893e3e1a896f4df3a2d Mon Sep 17 00:00:00 2001
|
|
|
eec4b3 |
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
|
eec4b3 |
Date: Thu, 26 Mar 2015 15:13:45 +0100
|
|
|
eec4b3 |
Subject: [PATCH] virt-viewer: Add a GError arg to update_display()
|
|
|
eec4b3 |
|
|
|
eec4b3 |
This is part of a small re-factoring that will have all connection
|
|
|
eec4b3 |
errors, when we won't be able to connect regardless of what changes on
|
|
|
eec4b3 |
the remote host, being treated by virt_viewer_app_initial_connect(),
|
|
|
eec4b3 |
avoiding weird behaviors as we have nowadays (like more than one error
|
|
|
eec4b3 |
dialog being shown or having the virt-viewer waiting forever for a guest
|
|
|
eec4b3 |
that will never show up).
|
|
|
eec4b3 |
|
|
|
eec4b3 |
Related: rhbz#1085216
|
|
|
eec4b3 |
(cherry picked from commit cab8f7450b8af6111c50d563321e5e7e50944479)
|
|
|
eec4b3 |
---
|
|
|
eec4b3 |
src/virt-viewer.c | 8 ++++----
|
|
|
eec4b3 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
eec4b3 |
|
|
|
eec4b3 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
|
eec4b3 |
index bdcdb20..6f76f92 100644
|
|
|
eec4b3 |
--- a/src/virt-viewer.c
|
|
|
eec4b3 |
+++ b/src/virt-viewer.c
|
|
|
eec4b3 |
@@ -516,7 +516,7 @@ virt_viewer_extract_connect_info(VirtViewer *self,
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
|
|
|
eec4b3 |
static gboolean
|
|
|
eec4b3 |
-virt_viewer_update_display(VirtViewer *self, virDomainPtr dom)
|
|
|
eec4b3 |
+virt_viewer_update_display(VirtViewer *self, virDomainPtr dom, GError **error)
|
|
|
eec4b3 |
{
|
|
|
eec4b3 |
VirtViewerPrivate *priv = self->priv;
|
|
|
eec4b3 |
VirtViewerApp *app = VIRT_VIEWER_APP(self);
|
|
|
eec4b3 |
@@ -532,7 +532,7 @@ virt_viewer_update_display(VirtViewer *self, virDomainPtr dom)
|
|
|
eec4b3 |
g_object_set(app, "guest-name", virDomainGetName(dom), NULL);
|
|
|
eec4b3 |
|
|
|
eec4b3 |
if (!virt_viewer_app_has_session(app)) {
|
|
|
eec4b3 |
- if (!virt_viewer_extract_connect_info(self, dom, NULL))
|
|
|
eec4b3 |
+ if (!virt_viewer_extract_connect_info(self, dom, error))
|
|
|
eec4b3 |
return FALSE;
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
|
|
|
eec4b3 |
@@ -607,7 +607,7 @@ virt_viewer_domain_event(virConnectPtr conn G_GNUC_UNUSED,
|
|
|
eec4b3 |
break;
|
|
|
eec4b3 |
|
|
|
eec4b3 |
case VIR_DOMAIN_EVENT_STARTED:
|
|
|
eec4b3 |
- virt_viewer_update_display(self, dom);
|
|
|
eec4b3 |
+ virt_viewer_update_display(self, dom, NULL);
|
|
|
eec4b3 |
virt_viewer_app_activate(app, &error);
|
|
|
eec4b3 |
if (error) {
|
|
|
eec4b3 |
/* we may want to consolidate error reporting in
|
|
|
eec4b3 |
@@ -772,7 +772,7 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
|
|
|
eec4b3 |
goto wait;
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
|
|
|
eec4b3 |
- if (!virt_viewer_update_display(self, dom))
|
|
|
eec4b3 |
+ if (!virt_viewer_update_display(self, dom, &err))
|
|
|
eec4b3 |
goto wait;
|
|
|
eec4b3 |
|
|
|
eec4b3 |
ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err;;
|