--bGR76rFJjkSxVeRa Content-Type: multipart/mixed; boundary="3O1VwFp74L81IIeR" Content-Disposition: inline --3O1VwFp74L81IIeR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey, On Sun, Dec 28, 2014 at 02:34:10AM -0600, i iordanov wrote: Sorry for the late reply, was on holidays for a while, came back just now :) I quickly cooked/compile-tested the attached patch, if you have time to test it, let me know how it works, otherwise I'll get back to that later (need to get lot of email under control first ;) Christophe --3O1VwFp74L81IIeR Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="proxy.patch" Content-Transfer-Encoding: quoted-printable diff --git a/govirt/ovirt-vm-display.c b/govirt/ovirt-vm-display.c index a8a0942..0a8adc6 100644 --- a/govirt/ovirt-vm-display.c +++ b/govirt/ovirt-vm-display.c @@ -39,6 +39,7 @@ struct _OvirtVmDisplayPrivate { char *host_subject; gboolean smartcard; gboolean allow_override; + char *proxy_url; }; =20 G_DEFINE_TYPE(OvirtVmDisplay, ovirt_vm_display, G_TYPE_OBJECT); @@ -55,6 +56,7 @@ enum { PROP_HOST_SUBJECT, PROP_SMARTCARD, PROP_ALLOW_OVERRIDE, + PROP_PROXY_URL, }; =20 static void ovirt_vm_display_get_property(GObject *object, @@ -95,6 +97,9 @@ static void ovirt_vm_display_get_property(GObject *object, case PROP_ALLOW_OVERRIDE: g_value_set_boolean(value, display->priv->allow_override); break; + case PROP_PROXY_URL: + g_value_set_string(value, display->priv->proxy_url); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); } @@ -141,6 +146,9 @@ static void ovirt_vm_display_set_property(GObject *obje= ct, case PROP_ALLOW_OVERRIDE: display->priv->allow_override =3D g_value_get_boolean(value); break; + case PROP_PROXY_URL: + g_free(display->priv->proxy_url); + display->priv->proxy_url =3D g_value_dup_string(value); default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); } @@ -153,6 +161,7 @@ static void ovirt_vm_display_finalize(GObject *object) g_free(display->priv->address); g_free(display->priv->ticket); g_free(display->priv->host_subject); + g_free(display->priv->proxy_url); =20 G_OBJECT_CLASS(ovirt_vm_display_parent_class)->finalize(object); } @@ -252,6 +261,14 @@ static void ovirt_vm_display_class_init(OvirtVmDisplay= Class *klass) FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STR= INGS)); + g_object_class_install_property(object_class, + PROP_PROXY_URL, + g_param_spec_string("proxy-url", + "Proxy URL", + "URL of the proxy = to use to access the VM", + NULL, + G_PARAM_READWRITE | + G_PARAM_STATIC_STR= INGS)); } =20 static void ovirt_vm_display_init(G_GNUC_UNUSED OvirtVmDisplay *display) diff --git a/govirt/ovirt-vm-xml.c b/govirt/ovirt-vm-xml.c index 7790887..22d50af 100644 --- a/govirt/ovirt-vm-xml.c +++ b/govirt/ovirt-vm-xml.c @@ -44,6 +44,7 @@ static gboolean vm_set_display_from_xml(OvirtVm *vm, const char *certificate_key =3D g_intern_string("certificate"); const char *smartcard_key =3D g_intern_string("smartcard_enabled"); const char *allow_override_key =3D g_intern_string("allow_override"); + const char *proxy_key =3D g_intern_string("proxy"); =20 if (root =3D=3D NULL) { return FALSE; @@ -120,6 +121,11 @@ static gboolean vm_set_display_from_xml(OvirtVm *vm, } } =20 + node =3D g_hash_table_lookup(root->children, proxy_key); + if (node !=3D NULL) { + g_object_set(G_OBJECT(display), "proxy-url", node->content, NULL); + } + /* FIXME: this overrides the ticket/expiry which may * already be set */ --3O1VwFp74L81IIeR-- --bGR76rFJjkSxVeRa Content-Type: application/pgp-signature --bGR76rFJjkSxVeRa--

--hQiwHBbRI9kgIhsi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 15, 2015 at 02:04:37PM +0100, Christophe Fergeau wrote: ject, Missing break; here Apart from this, this is working fine, I've pushed it upstream: https://git.gnome.org/browse/libgovirt/commit/?id=3De2f4e6ae0975b24d4d4cb52= 1ff1a2948e91af0e3 Christophe --hQiwHBbRI9kgIhsi Content-Type: application/pgp-signature --hQiwHBbRI9kgIhsi--