On Thu, Mar 26, 2015 at 11:26:59PM +0100, Fabiano Fidêncio wrote: > All the situations where virt_viewer_update_display() can fail are > those when we won't be able to connect regardless of what changes on the > remote host. So, propagate the error instead of keep waiting. I'd say "instead of waiting for the guest to start" or something like that. > > Related: rhbz#1085216 > --- > src/virt-viewer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/virt-viewer.c b/src/virt-viewer.c > index 15770f3..e94b897 100644 > --- a/src/virt-viewer.c > +++ b/src/virt-viewer.c > @@ -775,7 +775,7 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error) > } > > if (!virt_viewer_update_display(self, dom, &err)) > - goto wait; > + goto cleanup; > > ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err); > if (ret || err) > goto cleanup; I think here we lost a if (priv->waitvm) { goto wait; } else { goto cleanup; } during the "Simplify virt_viewer_initial_connect()" refactoring, but that's unrelated to that patch. Christophe > -- > 2.3.3 > > _______________________________________________ > virt-tools-list mailing list > virt-tools-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/virt-tools-list
Attachment:
pgpbx9vX0I3kY.pgp
Description: PGP signature
_______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list