Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at 2015-09-30 05:53:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-viewer (Old) and /work/SRC/openSUSE:Factory/.virt-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-viewer" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-viewer/virt-viewer.changes 2015-01-14 11:45:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-viewer.new/virt-viewer.changes 2015-09-30 05:53:19.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 21 15:06:17 MDT 2015 - [email protected] + +- bsc#946816 - virt-viewer: version 2.0 can't connect to Xen VMs + reverse-3d5627d7-for-xen.patch + +------------------------------------------------------------------- New: ---- reverse-3d5627d7-for-xen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.GjrvAn/_old 2015-09-30 05:53:20.000000000 +0200 +++ /var/tmp/diff_new_pack.GjrvAn/_new 2015-09-30 05:53:20.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if %suse_version >= 1315 %define gtk_arg --with-gtk=3.0 %else @@ -34,6 +33,7 @@ Patch51: windows-keycombo.patch Patch52: netware-keycombo.patch Patch53: virtview-desktop.patch +Patch54: reverse-3d5627d7-for-xen.patch ExclusiveArch: %ix86 x86_64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,6 +78,7 @@ %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 %build echo "suse_version = %suse_version" ++++++ reverse-3d5627d7-for-xen.patch ++++++ Revert this commit From: Marc-André Lureau [email protected] Wed Nov 12 11:14:19 2014 +0100 Subject: virt-viewer: allow connection to unix socket only server Date: Tue Nov 25 15:07:32 2014 +0100: Git: 3d5627d79a32bea5337659652e09be0d009940a4 Even when the server doesn't provide a display connection address, virt-viewer is able to connect to guest with libvirt attach. Index: virt-viewer-2.0/src/virt-viewer.c =================================================================== --- virt-viewer-2.0.orig/src/virt-viewer.c +++ virt-viewer-2.0/src/virt-viewer.c @@ -428,18 +428,17 @@ virt_viewer_extract_connect_info(VirtVie ghost = virt_viewer_extract_xpath_string(xmldesc, xpath); } else { xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@socket)", type); - unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath); + if ((unixsock = virt_viewer_extract_xpath_string(xmldesc, xpath)) == NULL) { + virt_viewer_app_simple_message_dialog(app, _("Cannot determine the graphic address for the guest %s"), + priv->domkey); + goto cleanup; + } } - if (ghost && gport) { + if (ghost && gport) g_debug("Guest graphics address is %s:%s", ghost, gport); - } else if (unixsock) { + else if (unixsock) g_debug("Guest graphics address is %s", unixsock); - } else { - g_debug("Using direct libvirt connection"); - retval = TRUE; - goto cleanup; - } uri = virConnectGetURI(priv->conn); if (virt_viewer_util_extract_host(uri, NULL, &host, &transport, &user, &port) < 0) {
