Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2016-07-03 12:28:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2016-06-21 12:29:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2016-07-03 12:28:10.000000000 +0200
@@ -1,0 +2,40 @@
+Mon Jun 20 15:21:20 MDT 2016 - carn...@suse.com
+
+- Update to virt-manager version 1.4.0 (fate#319990)
+ virt-manager-1.4.0.tar.bz2
+ e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
+ c5ce0ab5-connection-fix-transport-detection.patch
+ 6daff68a-fix-italian-lang-file.patch
+ virtman-dont-specify-vte-version.patch
+ * virt-manager: spice GL console support (Marc-André Lureau, Cole Robinson)
+ * Bump gtk and pygobject deps to 3.14
+ * virt-manager: add checkbox to forget keyring password (Pavel Hrdina)
+ * cli: add --graphics gl= (Marc-André Lureau)
+ * cli: add --video accel3d= (Marc-André Lureau)
+ * cli: add --graphics listen=none (Marc-André Lureau)
+ * cli: add --transient flag (Richard W.M. Jones)
+ * cli: --features gic= support, and set a default for it (Pavel Hrdina)
+ * cli: Expose --video heads, ram, vram, vgamem
+ * cli: add --graphics listen=socket
+ * cli: add device address.type/address.bus/...
+ * cli: add --disk seclabelX.model (and .label, .relabel)
+ * cli: add -cpu cellX.id (and .cpus, and .memory)
+ * cli: add --network rom_bar= and rom_file=
+ * cli: add --disk backing_format=
+ * Many bug fixes and improvements
+ - Dropped the following
+ virt-manager-1.3.2.tar.bz2
+ 89c3638b-fix-detection-that-libvirtd-is-stopped.patch
+ 21fd079e-replace-unar-with-other-archivers.patch
+ eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
+ 1c221fd0-suse-ovmf-paths.patch
+ f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
+ 8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
+ f454798b-virtman-fix-making-screenshot.patch
+ 5ecc2b44-dont-clear-recommended-machine-if-none-is-selected.patch
+ de9cd87f-return-recommended-machine-for-XEN.patch
+ 0acdea1d-show-firmware-options-also-for-XEN-guests.patch
+ virtinst-fix-sle12sp1-detection.patch
+ virtinst-fix-tumbleweed-detection.patch
+
+-------------------------------------------------------------------
Old:
----
0acdea1d-show-firmware-options-also-for-XEN-guests.patch
1c221fd0-suse-ovmf-paths.patch
21fd079e-replace-unar-with-other-archivers.patch
5ecc2b44-dont-clear-recommended-machine-if-none-is-selected.patch
89c3638b-fix-detection-that-libvirtd-is-stopped.patch
8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
de9cd87f-return-recommended-machine-for-XEN.patch
eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
f454798b-virtman-fix-making-screenshot.patch
virt-manager-1.3.2.tar.bz2
virtinst-fix-sle12sp1-detection.patch
virtinst-fix-tumbleweed-detection.patch
New:
----
6daff68a-fix-italian-lang-file.patch
c5ce0ab5-connection-fix-transport-detection.patch
e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
virt-manager-1.4.0.tar.bz2
virtman-dont-specify-vte-version.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:20.000000000 +0200
@@ -23,11 +23,11 @@
%define libvirt_xen_packages ""
%define preferred_distros "sles12sp1,opensuse42.1"
%define kvm_packages ""
-%define _version 1.3.2
+%define _version 1.4.0
%define _release 0
Name: virt-manager
-Version: 1.3.2
+Version: 1.4.0
Release: 0
Summary: Virtual Machine Manager
License: GPL-2.0+
@@ -37,16 +37,9 @@
Source1: virt-install.rb
Source2: virt-install.desktop
# Upstream Patches
-Patch1: 89c3638b-fix-detection-that-libvirtd-is-stopped.patch
-Patch2: 21fd079e-replace-unar-with-other-archivers.patch
-Patch3:
eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
-Patch4: 1c221fd0-suse-ovmf-paths.patch
-Patch5:
f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
-Patch6: 8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
-Patch7: f454798b-virtman-fix-making-screenshot.patch
-Patch8:
5ecc2b44-dont-clear-recommended-machine-if-none-is-selected.patch
-Patch9: de9cd87f-return-recommended-machine-for-XEN.patch
-Patch10: 0acdea1d-show-firmware-options-also-for-XEN-guests.patch
+Patch1: e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
+Patch2: c5ce0ab5-connection-fix-transport-detection.patch
+Patch3: 6daff68a-fix-italian-lang-file.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@@ -78,17 +71,15 @@
Patch152: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch
Patch153: virtman-check-for-valid-display.patch
Patch154: virtman-allow-creating-i686-vm.patch
+Patch155: virtman-dont-specify-vte-version.patch
Patch160: virtinst-xen-drive-type.patch
Patch161: virtinst-xenbus-disk-index-fix.patch
Patch162: virtinst-refresh_before_fetch_pool.patch
-Patch163: virtinst-fix-sle12sp1-detection.patch
-Patch164: virtinst-fix-tumbleweed-detection.patch
-Patch165: virtinst-use-xenpae-kernel-for-32bit.patch
+Patch163: virtinst-use-xenpae-kernel-for-32bit.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define verrel %{version}-%{release}
-Requires: avahi
Requires: dbus-1-x11
Requires: dconf
Requires: gtk3
@@ -168,13 +159,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
@@ -206,12 +190,11 @@
%patch152 -p1
%patch153 -p1
%patch154 -p1
+%patch155 -p1
%patch160 -p1
%patch161 -p1
%patch162 -p1
%patch163 -p1
-%patch164 -p1
-%patch165 -p1
%build
%if %{qemu_user}
++++++ 6daff68a-fix-italian-lang-file.patch ++++++
Note: This is just a part of the upstream patch
Subject: Update translations, and fix it.po problems
From: Cole Robinson crobi...@redhat.com Wed Jun 29 08:49:00 2016 -0400
Date: Wed Jun 29 08:49:00 2016 -0400:
Git: 6daff68a3f04fd166d555e4ad632564adc0e57a2
https://bugzilla.redhat.com/show_bug.cgi?id=1350185
Index: virt-manager-1.4.0/po/it.po
===================================================================
--- virt-manager-1.4.0.orig/po/it.po
+++ virt-manager-1.4.0/po/it.po
@@ -1460,7 +1460,7 @@ msgstr "Invia combinazione di tasti"
#: ../virtManager/console.py:289
#, python-format
msgid "%(vm-name)s on %(connection-name)s"
-msgstr "%(nome-mv)s su %(nome-connessione)s"
+msgstr "%(vm-name)s su %(connection-name)s"
#: ../virtManager/console.py:296
#, python-format
@@ -2515,7 +2515,7 @@ msgstr "Disabilitato"
#: ../virtManager/details.py:2435
#, python-format
msgid "%(current-memory)s of %(total-memory)s"
-msgstr "%(memoria-corrente)s di %(memoria-totale)s"
+msgstr "%(current-memory)s di %(total-memory)s"
#: ../virtManager/details.py:2645
msgid "Absolute Movement"
++++++ c5ce0ab5-connection-fix-transport-detection.patch ++++++
Subject: connection: Fix transport detection for qemu://$HOST/system
From: Cole Robinson crobi...@redhat.com Tue Jun 21 11:31:26 2016 -0400
Date: Tue Jun 21 11:31:26 2016 -0400:
Git: c5ce0ab512b0d8a3045b9d09329648559f825b86
In this case, when a host is specified but not a transport, libvirt
defaults to transport=tls
diff --git a/virtinst/connection.py b/virtinst/connection.py
index a09f4df..2efc3eb 100644
--- a/virtinst/connection.py
+++ b/virtinst/connection.py
@@ -355,6 +355,10 @@ class VirtualConnection(object):
def get_uri_username(self):
return self._uriobj.username
def get_uri_transport(self):
+ if self.get_uri_hostname() and not self._uriobj.transport:
+ # Libvirt defaults to transport=tls if hostname specified but
+ # no transport is specified
+ return "tls"
return self._uriobj.transport
def get_uri_path(self):
return self._uriobj.path
++++++ e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch ++++++
Subject: viewers: spice: Catch failure to setup usbdev manager
From: Cole Robinson crobi...@redhat.com Tue Jun 21 09:01:32 2016 -0400
Date: Tue Jun 21 09:01:32 2016 -0400:
Git: e69cc002b10b49a77f1cd5170931e5e9209ab240
Since some distros like openbsd don't compile support for
usb redirection, which makes this fail
https://bugzilla.redhat.com/show_bug.cgi?id=1348479
diff --git a/virtManager/viewers.py b/virtManager/viewers.py
index 403c316..2f7d2e9 100644
--- a/virtManager/viewers.py
+++ b/virtManager/viewers.py
@@ -538,16 +538,23 @@ class SpiceViewer(Viewer):
GObject.GObject.connect(self._spice_session, "channel-new",
self._channel_new_cb)
- self._usbdev_manager = SpiceClientGLib.UsbDeviceManager.get(
- self._spice_session)
- self._usbdev_manager.connect("auto-connect-failed",
- self._usbdev_redirect_error)
- self._usbdev_manager.connect("device-error",
- self._usbdev_redirect_error)
-
- autoredir = self.config.get_auto_redirection()
- if autoredir:
- gtk_session.set_property("auto-usbredir", True)
+ # Distros might have usb redirection compiled out, like OpenBSD
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1348479
+ try:
+ self._usbdev_manager = SpiceClientGLib.UsbDeviceManager.get(
+ self._spice_session)
+ self._usbdev_manager.connect("auto-connect-failed",
+ self._usbdev_redirect_error)
+ self._usbdev_manager.connect("device-error",
+ self._usbdev_redirect_error)
+
+ autoredir = self.config.get_auto_redirection()
+ if autoredir:
+ gtk_session.set_property("auto-usbredir", True)
+ except:
+ self._usbdev_manager = None
+ logging.debug("Error initializing spice usb device manager",
+ exc_info=True)
#####################
++++++ virt-manager-1.3.2.tar.bz2 -> virt-manager-1.4.0.tar.bz2 ++++++
++++ 225098 lines of diff (skipped)
++++++ virtinst-add-default-rng-device.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
References: bnc#885308
Enhancement to add a virtio RNG device to non windows VMs.
-Index: virt-manager-1.3.2/virtinst/guest.py
+Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/guest.py
-+++ virt-manager-1.3.2/virtinst/guest.py
+--- virt-manager-1.4.0.orig/virtinst/guest.py
++++ virt-manager-1.4.0/virtinst/guest.py
@@ -54,6 +54,7 @@ from .pm import PM
from .seclabel import Seclabel
from .xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty
@@ -12,7 +12,7 @@
class Guest(XMLBuilder):
-@@ -712,6 +713,15 @@ class Guest(XMLBuilder):
+@@ -654,6 +655,15 @@ class Guest(XMLBuilder):
return
self.add_device(VirtualGraphics(self.conn))
@@ -28,7 +28,7 @@
def add_default_devices(self):
self.add_default_graphics()
self.add_default_video_device()
-@@ -719,6 +729,7 @@ class Guest(XMLBuilder):
+@@ -661,6 +671,7 @@ class Guest(XMLBuilder):
self.add_default_console_device()
self.add_default_usb_controller()
self.add_default_channels()
++++++ virtinst-add-ppc64-arch-support.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,10 +1,10 @@
Reference: bnc#869024
Add s390x and ppc64 support
-Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+Index: virt-manager-1.4.0/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.3.2/virtinst/urlfetcher.py
-@@ -430,6 +430,10 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.0/virtinst/urlfetcher.py
+@@ -438,6 +438,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586"
elif cbuf.find("s390x") != -1:
arch = "s390x"
@@ -13,9 +13,9 @@
+ elif cbuf.find("ppc64le") != -1:
+ arch = "ppc64le"
- dclass = GenericDistro
- if distribution:
-@@ -969,10 +973,12 @@ class SuseDistro(Distro):
+ def _parse_sle_distribution(d):
+ sle_version = d[1].strip().rsplit(' ')[4]
+@@ -989,10 +993,12 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"
++++++ virtinst-detect-oes-distros.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,13 +1,13 @@
Enhancement to correctly detect Open Enterprise Server media is
selected as the installation source.
-Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+Index: virt-manager-1.4.0/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.3.2/virtinst/urlfetcher.py
-@@ -442,6 +442,10 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.0/virtinst/urlfetcher.py
+@@ -456,6 +456,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLEDDistro
if distro_version is None:
- distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
+ distro_version = _parse_sle_distribution(distribution)
+ elif re.match(".*Open Enterprise Server*", distribution[1]):
+ dclass = SLESDistro
+ if distro_version is None:
++++++ virtinst-modify-gui-defaults.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -3,11 +3,11 @@
is the default
2) Under 'Network selection' default to a bridge that has an actual
IP address if available (not just the first one found).
-Index: virt-manager-1.3.0/virtManager/create.py
+Index: virt-manager-1.4.0/virtManager/create.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/create.py
-+++ virt-manager-1.3.0/virtManager/create.py
-@@ -371,7 +371,19 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/create.py
++++ virt-manager-1.4.0/virtManager/create.py
+@@ -376,7 +376,19 @@ class vmmCreate(vmmGObjectUI):
self.widget("method-local").set_active(True)
self.widget("create-conn").set_active(-1)
activeconn = self._populate_conn_list(urihint)
@@ -28,10 +28,10 @@
if self._set_conn(activeconn) is False:
return False
-Index: virt-manager-1.3.0/virtManager/netlist.py
+Index: virt-manager-1.4.0/virtManager/netlist.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/netlist.py
-+++ virt-manager-1.3.0/virtManager/netlist.py
+--- virt-manager-1.4.0.orig/virtManager/netlist.py
++++ virt-manager-1.4.0/virtManager/netlist.py
@@ -167,9 +167,19 @@ class vmmNetworkList(vmmGObjectUI):
return rows, vnet_bridges, default_label
++++++ virtinst-nfs-install-sanitize.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -5,10 +5,10 @@
and carry the latter form around internally"
We need the RFC version to work correctly whereas redhat's anaconda
needs their own modified version.
-Index: virt-manager-1.3.2/virtinst/util.py
+Index: virt-manager-1.4.0/virtinst/util.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/util.py
-+++ virt-manager-1.3.2/virtinst/util.py
+--- virt-manager-1.4.0.orig/virtinst/util.py
++++ virt-manager-1.4.0/virtinst/util.py
@@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only
return (index_dom0, zypper_output)
@@ -32,11 +32,11 @@
+
+ return url
+
-Index: virt-manager-1.3.2/virtinst/distroinstaller.py
+Index: virt-manager-1.4.0/virtinst/distroinstaller.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/distroinstaller.py
-+++ virt-manager-1.3.2/virtinst/distroinstaller.py
-@@ -49,6 +49,8 @@ def _sanitize_url(url):
+--- virt-manager-1.4.0.orig/virtinst/distroinstaller.py
++++ virt-manager-1.4.0/virtinst/distroinstaller.py
+@@ -44,6 +44,8 @@ def _sanitize_url(url):
"""
Do nothing for http or ftp, but make sure nfs is in the expected format
"""
@@ -45,19 +45,19 @@
if url.startswith("nfs://"):
# Convert RFC compliant NFS nfs://server/path/to/distro
# to what mount/anaconda expect nfs:server:/path/to/distro
-Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+Index: virt-manager-1.4.0/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.3.2/virtinst/urlfetcher.py
-@@ -33,6 +33,7 @@ import urllib2
- import urlparse
+--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.0/virtinst/urlfetcher.py
+@@ -34,6 +34,7 @@ import urlparse
+ import requests
from .osdict import OSDB
+from virtinst import util
#########################################################################
-@@ -298,7 +299,8 @@ class _MountedURLFetcher(_LocalURLFetche
+@@ -301,7 +302,8 @@ class _MountedURLFetcher(_LocalURLFetche
logging.debug("Preparing mount at " + self._srcdir)
if self.location.startswith("nfs:"):
++++++ virtinst-pvgrub2-bootloader.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -2,11 +2,11 @@
grub.xen is required to boot PV VMs that use the BTRFS filesystem.
This patch forces the use of grub.xen (instead of using pygrub) for
newer suse distros like SLE12 and openSUSE 13.2.
-Index: virt-manager-1.3.2/virtinst/guest.py
+Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/guest.py
-+++ virt-manager-1.3.2/virtinst/guest.py
-@@ -365,8 +365,20 @@ class Guest(XMLBuilder):
+--- virt-manager-1.4.0.orig/virtinst/guest.py
++++ virt-manager-1.4.0/virtinst/guest.py
+@@ -362,8 +362,20 @@ class Guest(XMLBuilder):
if (not install and
self.os.is_xenpv() and
not self.os.kernel):
@@ -29,10 +29,10 @@
return self.get_xml_config()
-Index: virt-manager-1.3.2/virtinst/installer.py
+Index: virt-manager-1.4.0/virtinst/installer.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/installer.py
-+++ virt-manager-1.3.2/virtinst/installer.py
+--- virt-manager-1.4.0.orig/virtinst/installer.py
++++ virt-manager-1.4.0/virtinst/installer.py
@@ -99,7 +99,7 @@ class Installer(object):
break
return bootorder
++++++ virtinst-s390x-disable-graphics.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Reference: bnc#869024
Disable graphics on s390x
-Index: virt-manager-1.3.2/virtinst/guest.py
+Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/guest.py
-+++ virt-manager-1.3.2/virtinst/guest.py
+--- virt-manager-1.4.0.orig/virtinst/guest.py
++++ virt-manager-1.4.0/virtinst/guest.py
@@ -123,7 +123,10 @@ class Guest(XMLBuilder):
self.skip_default_channel = False
self.skip_default_sound = False
@@ -16,7 +16,7 @@
self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
self.__os_object = None
-@@ -663,7 +666,7 @@ class Guest(XMLBuilder):
+@@ -605,7 +608,7 @@ class Guest(XMLBuilder):
self.add_device(dev)
def add_default_video_device(self):
@@ -25,7 +25,7 @@
return
if self.get_devices("video"):
return
-@@ -701,6 +704,8 @@ class Guest(XMLBuilder):
+@@ -643,6 +646,8 @@ class Guest(XMLBuilder):
dev.target_type = "virtio"
dev.target_name = dev.CHANNEL_NAME_QEMUGA
self.add_device(dev)
@@ -34,7 +34,7 @@
def add_default_graphics(self):
if self.skip_default_graphics:
-@@ -709,7 +714,7 @@ class Guest(XMLBuilder):
+@@ -651,7 +656,7 @@ class Guest(XMLBuilder):
return
if self.os.is_container():
return
@@ -43,7 +43,7 @@
return
self.add_device(VirtualGraphics(self.conn))
-@@ -1035,7 +1040,7 @@ class Guest(XMLBuilder):
+@@ -979,7 +984,7 @@ class Guest(XMLBuilder):
if self._hv_only_supports_virtio():
return True
++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Set cache mode for target installation disk to unsafe for better
performance.
-Index: virt-manager-1.3.2/virtinst/guest.py
+Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/guest.py
-+++ virt-manager-1.3.2/virtinst/guest.py
+--- virt-manager-1.4.0.orig/virtinst/guest.py
++++ virt-manager-1.4.0/virtinst/guest.py
@@ -53,6 +53,7 @@ from .osxml import OSXML
from .pm import PM
from .seclabel import Seclabel
@@ -12,7 +12,7 @@
class Guest(XMLBuilder):
-@@ -361,6 +362,17 @@ class Guest(XMLBuilder):
+@@ -358,6 +359,17 @@ class Guest(XMLBuilder):
self._set_osxml_defaults()
@@ -30,7 +30,7 @@
self.bootloader = None
if (not install and
self.os.is_xenpv() and
-@@ -380,7 +392,10 @@ class Guest(XMLBuilder):
+@@ -377,7 +389,10 @@ class Guest(XMLBuilder):
self.bootloader = "/usr/bin/pygrub"
self.os.clear()
++++++ virtinst-set-qemu-emulator.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,11 +1,11 @@
Use the correct qemu emulator based on the architecture.
We want to get away from using the old qemu-dm emulator
for Xen HVM guests so default to qemu-system-i386.
-Index: virt-manager-1.3.2/virtinst/guest.py
+Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/guest.py
-+++ virt-manager-1.3.2/virtinst/guest.py
-@@ -850,14 +850,11 @@ class Guest(XMLBuilder):
+--- virt-manager-1.4.0.orig/virtinst/guest.py
++++ virt-manager-1.4.0/virtinst/guest.py
+@@ -792,14 +792,11 @@ class Guest(XMLBuilder):
self.emulator = None
return
++++++ virtinst-storage-ocfs2.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Enhancement to add ocfs2 as a supported FS type
-Index: virt-manager-1.3.0/virtinst/storage.py
+Index: virt-manager-1.4.0/virtinst/storage.py
===================================================================
---- virt-manager-1.3.0.orig/virtinst/storage.py
-+++ virt-manager-1.3.0/virtinst/storage.py
-@@ -448,7 +448,7 @@ class StoragePool(_StorageObject):
+--- virt-manager-1.4.0.orig/virtinst/storage.py
++++ virt-manager-1.4.0/virtinst/storage.py
+@@ -459,7 +459,7 @@ class StoragePool(_StorageObject):
def list_formats(self):
if self.type == self.TYPE_FS:
return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
++++++ virtinst-use-xenpae-kernel-for-32bit.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -4,11 +4,11 @@
virtualized if the pae kernel is selected.
Note that sles12 and newer has no 32bit release.
-Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+Index: virt-manager-1.4.0/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.3.2/virtinst/urlfetcher.py
-@@ -999,8 +999,12 @@ class SuseDistro(Distro):
+--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.0/virtinst/urlfetcher.py
+@@ -1012,8 +1012,12 @@ class SuseDistro(Distro):
"boot/%s/initrd" % self.arch))
# Matches Opensuse > 10.2 and sles 10
++++++ virtinst-vol-default-nocow.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -4,13 +4,13 @@
Signed-off-by: Chunyan Liu <cy...@suse.com>
-Index: virt-manager-1.3.2/virtinst/storage.py
+Index: virt-manager-1.4.0/virtinst/storage.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/storage.py
-+++ virt-manager-1.3.2/virtinst/storage.py
-@@ -716,6 +716,12 @@ class StorageVolume(_StorageObject):
- lazy_refcounts = XMLProperty("./target/features/lazy_refcounts",
- is_bool=True, default_cb=_lazy_refcounts_default_cb)
+--- virt-manager-1.4.0.orig/virtinst/storage.py
++++ virt-manager-1.4.0/virtinst/storage.py
+@@ -707,6 +707,12 @@ class StorageVolume(_StorageObject):
+ return self.TYPE_FILE
+ file_type = property(_get_vol_type)
+ def _nocow_default_cb(self):
+ return self.conn.check_support(
@@ -19,18 +19,18 @@
+ is_bool=True, default_cb=_nocow_default_cb)
+
- ######################
- # Public API helpers #
-Index: virt-manager-1.3.2/virtinst/support.py
+ ##################
+ # XML properties #
+Index: virt-manager-1.4.0/virtinst/support.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/support.py
-+++ virt-manager-1.3.2/virtinst/support.py
-@@ -314,6 +314,8 @@ SUPPORT_CONN_VCPU_PLACEMENT = _make(
- SUPPORT_CONN_MEM_STATS_PERIOD = _make(
- function="virDomain.setMemoryStatsPeriod",
- version="1.1.1", hv_version={"qemu": 0})
+--- virt-manager-1.4.0.orig/virtinst/support.py
++++ virt-manager-1.4.0/virtinst/support.py
+@@ -316,6 +316,8 @@ SUPPORT_CONN_SPICE_GL = _make(version="1
+ SUPPORT_CONN_VIDEO_VIRTIO_ACCEL3D = _make(version="1.3.0",
+ hv_version={"qemu": "2.7.0", "test": 0})
+ SUPPORT_CONN_GRAPHICS_LISTEN_NONE = _make(version="2.0.0")
+SUPPORT_CONN_NOCOW = _make(
+ version="1.2.18", hv_version={"qemu": "2.2.0", "test": 0})
+
# This is for disk <driver name=qemu>. xen supports this, but it's
- # limited to arbitrary new enough xen, since I know libxl can handle it
++++++ virtinst-xen-drive-type.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -2,11 +2,11 @@
Virt-manager on Xen doesn't fill in any type thereby defaulting to
'raw'. This patch will generate the correct XML on Xen.
-Index: virt-manager-1.3.2/virtinst/devicedisk.py
+Index: virt-manager-1.4.0/virtinst/devicedisk.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/devicedisk.py
-+++ virt-manager-1.3.2/virtinst/devicedisk.py
-@@ -557,6 +557,10 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.4.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.4.0/virtinst/devicedisk.py
+@@ -568,6 +568,10 @@ class VirtualDisk(VirtualDevice):
http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
"""
if self.driver_name != self.DRIVER_NAME_QEMU:
++++++ virtinst-xenbus-disk-index-fix.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -6,11 +6,11 @@
passed to qemu where it error'ed out with the disks having the same
index (in this case both are 0).
-Index: virt-manager-1.3.2/virtinst/devicedisk.py
+Index: virt-manager-1.4.0/virtinst/devicedisk.py
===================================================================
---- virt-manager-1.3.2.orig/virtinst/devicedisk.py
-+++ virt-manager-1.3.2/virtinst/devicedisk.py
-@@ -978,6 +978,17 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.4.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.4.0/virtinst/devicedisk.py
+@@ -993,6 +993,17 @@ class VirtualDisk(VirtualDevice):
@rtype C{str}
"""
prefix, maxnode = self.get_target_prefix(skip_targets)
@@ -28,7 +28,7 @@
skip_targets = [t for t in skip_targets if t and t.startswith(prefix)]
skip_targets.sort()
-@@ -991,7 +1002,12 @@ class VirtualDisk(VirtualDevice):
+@@ -1006,7 +1017,12 @@ class VirtualDisk(VirtualDevice):
ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
for i in ran:
++++++ virtman-allow-creating-i686-vm.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,11 +1,11 @@
References: bsc#919692
Because openSUSE repos combine 32 and 64 bit sources we need to
continue showing the 'Architecture' pop-up.
-Index: virt-manager-1.3.0/virtManager/create.py
+Index: virt-manager-1.4.0/virtManager/create.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/create.py
-+++ virt-manager-1.3.0/virtManager/create.py
-@@ -775,11 +775,6 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/create.py
++++ virt-manager-1.4.0/virtManager/create.py
+@@ -780,11 +780,6 @@ class vmmCreate(vmmGObjectUI):
for guest in self.conn.caps.guests:
if guest.os_type == self._capsinfo.os_type:
archs.append(guest.arch)
++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -6,11 +6,11 @@
4) Edit the VM's /etc/default/grub file and remove the crashkernel information
and then run grub2-mkconfig /boot/grub2/grub.cfg.
5) Start the VM and within the VM's terminal type "echo 'c' >
/proc/sysrq-trigger"
-Index: virt-manager-1.3.2/virtManager/manager.py
+Index: virt-manager-1.4.0/virtManager/manager.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/manager.py
-+++ virt-manager-1.3.2/virtManager/manager.py
-@@ -854,7 +854,7 @@ class vmmManager(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/manager.py
++++ virt-manager-1.4.0/virtManager/manager.py
+@@ -839,7 +839,7 @@ class vmmManager(vmmGObjectUI):
show_pause = bool(vm and vm.is_unpauseable())
else:
show_pause = bool(vm and vm.is_pauseable())
@@ -19,10 +19,10 @@
if vm and vm.managedsave_supported:
self.change_run_text(vm.has_managed_save())
-Index: virt-manager-1.3.2/virtManager/vmmenu.py
+Index: virt-manager-1.4.0/virtManager/vmmenu.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/vmmenu.py
-+++ virt-manager-1.3.2/virtManager/vmmenu.py
+--- virt-manager-1.4.0.orig/virtManager/vmmenu.py
++++ virt-manager-1.4.0/virtManager/vmmenu.py
@@ -31,6 +31,7 @@ class _VMMenu(Gtk.Menu):
self._parent = src
self._current_vm_cb = current_vm_cb
++++++ virtman-check-for-valid-display.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,15 +1,15 @@
References: bnc#907958
Sanity check for those who forget '-X' on ssh and try to start virt-manager
-Index: virt-manager-1.3.0/virt-manager
+Index: virt-manager-1.4.0/virt-manager
===================================================================
---- virt-manager-1.3.0.orig/virt-manager
-+++ virt-manager-1.3.0/virt-manager
-@@ -171,8 +171,11 @@ def main():
- from gi.repository import Gtk
- leftovers = sys.argv[1:]
+--- virt-manager-1.4.0.orig/virt-manager
++++ virt-manager-1.4.0/virt-manager
+@@ -79,8 +79,11 @@ def _import_gtk(leftovers):
+ print "gtk3 3.14.0 or later is required."
+ sys.exit(1)
- # This will error if Gtk wasn't correctly initialized
-- Gtk.Window()
+- Gtk.init()
+ if os.environ.has_key('DISPLAY') and os.environ['DISPLAY']:
+ # This will error if Gtk wasn't correctly initialized
+ Gtk.Window()
++++++ virtman-default-guest-from-host-os.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Enhancement to default to the host os version when creating a VM
and media detection of the install source is turned off.
-Index: virt-manager-1.3.0/virtManager/create.py
+Index: virt-manager-1.4.0/virtManager/create.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/create.py
-+++ virt-manager-1.3.0/virtManager/create.py
+--- virt-manager-1.4.0.orig/virtManager/create.py
++++ virt-manager-1.4.0/virtManager/create.py
@@ -21,6 +21,8 @@
import logging
import threading
@@ -13,7 +13,7 @@
from gi.repository import GObject
from gi.repository import Gtk
-@@ -963,7 +965,7 @@ class vmmCreate(vmmGObjectUI):
+@@ -968,7 +970,7 @@ class vmmCreate(vmmGObjectUI):
preferred = self.config.preferred_distros
variants = virtinst.OSDB.list_os(typename=_type, sortpref=preferred)
supportl = virtinst.OSDB.list_os(typename=_type, sortpref=preferred,
@@ -22,7 +22,7 @@
for v in variants:
supported = v in supportl or v.name == "generic"
-@@ -1320,6 +1322,53 @@ class vmmCreate(vmmGObjectUI):
+@@ -1324,6 +1326,53 @@ class vmmCreate(vmmGObjectUI):
def _cdrom_changed(self, src):
self._detectable_media_widget_changed(src)
@@ -76,7 +76,7 @@
def _toggle_detect_os(self, src):
dodetect = src.get_active()
-@@ -1332,6 +1381,8 @@ class vmmCreate(vmmGObjectUI):
+@@ -1336,6 +1385,8 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-os-version-entry").set_text("")
self._os_already_detected_for_media = False
self._start_detect_os_if_needed()
++++++ virtman-default-to-xen-pv.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Enhancement to default to PV instead of HVM on Xen host.
-Index: virt-manager-1.3.0/virtManager/create.py
+Index: virt-manager-1.4.0/virtManager/create.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/create.py
-+++ virt-manager-1.3.0/virtManager/create.py
-@@ -685,7 +685,12 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/create.py
++++ virt-manager-1.4.0/virtManager/create.py
+@@ -690,7 +690,12 @@ class vmmCreate(vmmGObjectUI):
if gtype is None:
# If none specified, prefer HVM so install options aren't limited
# with a default PV choice.
++++++ virtman-dont-allow-grub.xen-to-be-deleted.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,14 +1,14 @@
Reference: bnc#885094
grub.xen is required to boot Xen PV VMs using BTRFS. It belongs to
the grub2-x86_64-xen RPM and should never be deleted.
-Index: virt-manager-1.3.0/virtManager/delete.py
+Index: virt-manager-1.4.0/virtManager/delete.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/delete.py
-+++ virt-manager-1.3.0/virtManager/delete.py
-@@ -242,7 +242,7 @@ def populate_storage_list(storage_list,
- diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False))
+--- virt-manager-1.4.0.orig/virtManager/delete.py
++++ virt-manager-1.4.0/virtManager/delete.py
+@@ -243,7 +243,7 @@ def populate_storage_list(storage_list,
+ diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True))
- for target, path, ro, shared in diskdata:
+ for target, path, ro, shared, is_media in diskdata:
- if not path:
+ if not path or path == "/usr/lib/grub2/x86_64-xen/grub.xen":
continue
++++++ virtman-dont-specify-vte-version.patch ++++++
Creates a problem for gobject-introspection identifying what
version of vte is really allowed. Vte 2.91 is installed on the
host but the RPM is built requiring 2.90.
--- virt-manager-1.4.0/virtManager/serialcon.py.orig 2016-06-21
15:35:45.109272839 -0600
+++ virt-manager-1.4.0/virtManager/serialcon.py 2016-06-21 15:35:56.637272738
-0600
@@ -32,12 +32,12 @@ from gi.repository import Gtk
# We can use either 2.91 or 2.90. This is just to silence runtime warnings
# pylint: disable=wrong-import-position
-try:
- gi.require_version("Vte", "2.91")
- logging.debug("Using VTE API 2.91")
-except ValueError:
- gi.require_version("Vte", "2.90")
- logging.debug("Using VTE API 2.90")
+#try:
+# gi.require_version("Vte", "2.91")
+# logging.debug("Using VTE API 2.91")
+#except ValueError:
+# gi.require_version("Vte", "2.90")
+# logging.debug("Using VTE API 2.90")
from gi.repository import Vte
import libvirt
++++++ virtman-increase-setKeepAlive-count.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -2,11 +2,11 @@
For very large memory VMs Xen takes a long time scrubbing memory
which causes the libvirt connection to timeout. Upstream was not
interested in making this a preferences option (4/11/2015)
-Index: virt-manager-1.3.0/virtManager/connection.py
+Index: virt-manager-1.4.0/virtManager/connection.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/connection.py
-+++ virt-manager-1.3.0/virtManager/connection.py
-@@ -945,7 +945,7 @@ class vmmConnection(vmmGObject):
+--- virt-manager-1.4.0.orig/virtManager/connection.py
++++ virt-manager-1.4.0/virtManager/connection.py
+@@ -947,7 +947,7 @@ class vmmConnection(vmmGObject):
self.caps.get_cpu_values("x86_64")
try:
++++++ virtman-keycombo.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -1,9 +1,9 @@
Enhancement adding Send Keys for mostly NetWare and also Windows
-Index: virt-manager-1.3.0/virtManager/console.py
+Index: virt-manager-1.4.0/virtManager/console.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/console.py
-+++ virt-manager-1.3.0/virtManager/console.py
-@@ -141,6 +141,16 @@ class vmmConsolePages(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/console.py
++++ virt-manager-1.4.0/virtManager/console.py
+@@ -218,6 +218,16 @@ class vmmConsolePages(vmmGObjectUI):
make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
menu.add(Gtk.SeparatorMenuItem())
++++++ virtman-packages.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -4,11 +4,11 @@
libvirt packages (kvm vs xen). Only install those libvirt packages
for which the host is booted. This patch has a corresponding spec
file change (%define libvirt_kvm_packages and %define libvirt_xen_packages).
-Index: virt-manager-1.3.2/setup.py
+Index: virt-manager-1.4.0/setup.py
===================================================================
---- virt-manager-1.3.2.orig/setup.py
-+++ virt-manager-1.3.2/setup.py
-@@ -299,8 +299,11 @@ class configure(distutils.core.Command):
+--- virt-manager-1.4.0.orig/setup.py
++++ virt-manager-1.4.0/setup.py
+@@ -308,8 +308,11 @@ class configure(distutils.core.Command):
("prefix=", None, "installation prefix"),
("qemu-user=", None,
"user libvirt uses to launch qemu processes (default=root)"),
@@ -22,7 +22,7 @@
"first run. comma separated string (default=none)"),
("kvm-package-names=", None,
"recommended kvm packages virt-manager will check for on first run "
-@@ -326,7 +329,8 @@ class configure(distutils.core.Command):
+@@ -335,7 +338,8 @@ class configure(distutils.core.Command):
def initialize_options(self):
self.prefix = sysprefix
self.qemu_user = None
@@ -32,7 +32,7 @@
self.kvm_package_names = None
self.askpass_package_names = None
self.preferred_distros = None
-@@ -341,8 +345,10 @@ class configure(distutils.core.Command):
+@@ -350,8 +354,10 @@ class configure(distutils.core.Command):
template += "prefix = %s\n" % self.prefix
if self.qemu_user is not None:
template += "default_qemu_user = %s\n" % self.qemu_user
@@ -45,10 +45,10 @@
if self.kvm_package_names is not None:
template += "hv_packages = %s\n" % self.kvm_package_names
if self.askpass_package_names is not None:
-Index: virt-manager-1.3.2/virtcli/cliconfig.py
+Index: virt-manager-1.4.0/virtcli/cliconfig.py
===================================================================
---- virt-manager-1.3.2.orig/virtcli/cliconfig.py
-+++ virt-manager-1.3.2/virtcli/cliconfig.py
+--- virt-manager-1.4.0.orig/virtcli/cliconfig.py
++++ virt-manager-1.4.0/virtcli/cliconfig.py
@@ -83,7 +83,8 @@ class _CLIConfig(object):
_get_param("preferred_distros", ""))
self.hv_packages = _split_list(_get_param("hv_packages", ""))
@@ -59,10 +59,10 @@
self.default_graphics = _get_param("default_graphics", "spice")
self.default_hvs = _split_list(_get_param("default_hvs", ""))
-Index: virt-manager-1.3.2/virtManager/config.py
+Index: virt-manager-1.4.0/virtManager/config.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/config.py
-+++ virt-manager-1.3.2/virtManager/config.py
+--- virt-manager-1.4.0.orig/virtManager/config.py
++++ virt-manager-1.4.0/virtManager/config.py
@@ -172,7 +172,8 @@ class vmmConfig(object):
self.default_qemu_user = CLIConfig.default_qemu_user
self.preferred_distros = CLIConfig.preferred_distros
@@ -73,10 +73,10 @@
self.askpass_package = CLIConfig.askpass_package
self.default_graphics_from_config = CLIConfig.default_graphics
self.default_hvs = CLIConfig.default_hvs
-Index: virt-manager-1.3.2/virtManager/engine.py
+Index: virt-manager-1.4.0/virtManager/engine.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/engine.py
-+++ virt-manager-1.3.2/virtManager/engine.py
+--- virt-manager-1.4.0.orig/virtManager/engine.py
++++ virt-manager-1.4.0/virtManager/engine.py
@@ -226,21 +226,18 @@ class vmmEngine(vmmGObject):
ret = None
++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -3,14 +3,14 @@
virt-manager issues two start commands to start the VM which
results in a failure. There is code elsewhere to desensitize the
button but this patch does it earlier.
-Index: virt-manager-1.3.2/virtManager/details.py
+Index: virt-manager-1.4.0/virtManager/details.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/details.py
-+++ virt-manager-1.3.2/virtManager/details.py
-@@ -1416,6 +1416,9 @@ class vmmDetails(vmmGObjectUI):
- self.widget("details-menu-usb-redirection").set_sensitive(can_usb)
-
+--- virt-manager-1.4.0.orig/virtManager/details.py
++++ virt-manager-1.4.0/virtManager/details.py
+@@ -1418,6 +1418,9 @@ class vmmDetails(vmmGObjectUI):
def control_vm_run(self, src_ignore):
+ if self.has_unapplied_changes(self.get_hw_row()):
+ return
+ # De-sensitize widget so a double click on the icon won't attempt to
+ # start the VM twice
+ self.widget("control-run").set_sensitive(False)
++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.gAxpL5/_old 2016-07-03 12:28:22.000000000 +0200
+++ /var/tmp/diff_new_pack.gAxpL5/_new 2016-07-03 12:28:22.000000000 +0200
@@ -2,11 +2,11 @@
install.inf and also collects the repos provided by zypper.
These locations are then presented as potential installation
locations when creating a VM.
-Index: virt-manager-1.3.0/virtManager/create.py
+Index: virt-manager-1.4.0/virtManager/create.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/create.py
-+++ virt-manager-1.3.0/virtManager/create.py
-@@ -398,7 +398,13 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.0.orig/virtManager/create.py
++++ virt-manager-1.4.0/virtManager/create.py
+@@ -403,7 +403,13 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-url-entry").set_text("")
self.widget("install-url-options").set_expanded(False)
urlmodel = self.widget("install-url-combo").get_model()
@@ -21,10 +21,10 @@
self._set_distro_labels("-", "-")
# Install import
-Index: virt-manager-1.3.0/virtinst/util.py
+Index: virt-manager-1.4.0/virtinst/util.py
===================================================================
---- virt-manager-1.3.0.orig/virtinst/util.py
-+++ virt-manager-1.3.0/virtinst/util.py
+--- virt-manager-1.4.0.orig/virtinst/util.py
++++ virt-manager-1.4.0/virtinst/util.py
@@ -24,9 +24,12 @@ import random
import re
import stat
