From bb44ce0a1faaf7c7dbff2ca520b7ab83bda5b6ea Mon Sep 17 00:00:00 2001 From: Ján Tomko Date: Wed, 1 Oct 2014 15:36:04 +0200 Subject: Prefer virDomainOpenGraphicsFD for --attach MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The virDomainOpenGraphics API cannot label the socket we pass to it. Prefer virDomainOpenGraphicsFD (if building with libvirt 1.2.8 or later) which creates the socket for us and works with SELinux too. Fall back to the old API if the new one is unsupported (i.e. the libvirtd on the host is older than the libvirt version virt-viewer was compiled against). Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1141228 Signed-off-by: Ján Tomko --- src/virt-viewer.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/virt-viewer.c b/src/virt-viewer.c index c6066c5..4b90a59 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -428,18 +428,31 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd) VirtViewer *viewer = VIRT_VIEWER(self); VirtViewerPrivate *priv = viewer->priv; int pair[2]; + virErrorPtr err; #endif *fd = -1; #if defined(HAVE_SOCKETPAIR) if (!priv->dom) return TRUE; +#ifdef HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD + if ((*fd = virDomainOpenGraphicsFD(priv->dom, 0, + VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH)) >= 0) + return TRUE; + + err = virGetLastError(); + if (err && err->code != VIR_ERR_NO_SUPPORT) { + g_debug("Error %s", err->message ? err->message : "Unknown"); + return TRUE; + } +#endif + if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0) return FALSE; if (virDomainOpenGraphics(priv->dom, 0, pair[0], VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) < 0) { - virErrorPtr err = virGetLastError(); + err = virGetLastError(); g_debug("Error %s", err && err->message ? err->message : "Unknown"); close(pair[0]); close(pair[1]); -- cgit