pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 14:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify virt_viewer_initial_connect()

Browse Source 
- remove need for waitvm if the display server isn't yet started (note:
  this function might be untested, I am not sure relying on libvirt events
  is enough)
This commit is contained in:
Marc-André Lureau 2014-11-13 18:20:42 +01:00
parent 7931161d59
commit 9e2f9ea064
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/virt-viewer.c
View File

@ -685,18 +685,11 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
goto wait;
}
ret = virt_viewer_update_display(self, dom);
if (ret)
if (ret) {
ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err);
if (!ret) {
if (priv->waitvm) {
virt_viewer_app_show_status(app, _("Waiting for guest domain to start server"));
goto wait;
} else {
g_set_error_literal(&err, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
_("Failed to activate viewer"));
g_debug("%s", err->message);
goto cleanup;
}
virt_viewer_app_show_status(app, _("Waiting for guest domain to start server"));
goto wait;
}
wait: