Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2017-08-16 16:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Wed Aug 16 16:13:34 2017 rev:153 rq:515823 version:1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2017-06-15 11:26:06.376420764 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2017-08-16 16:13:36.438279506 +0200
@@ -1,0 +2,42 @@
+Wed Aug 9 08:27:42 MDT 2017 - carn...@suse.com
+
+- Update to virt-manager 1.4.2 (bsc#1027942)
+ virt-manager-1.4.1.tar.bz2
+ virtinst-check-date-format.patch
+ virtinst-no-usb-tablet-for-xenpv.patch
+ * New VM wixard virt-bootstrap integration (Radostin Stoyanov)
+ * New VM wizard support for virtuozzo containers (Mikhail Feoktistov)
+ * network UI: add support to create SR-IOV VF pool (Lin Ma)
+ * Nicer OS list in New VM wizard (Pino Toscano)
+ * Better defaults for UEFI secureboot builds (Pavel Hrdina)
+ * Fix defaults for aarch64 VMs if graphics are requested
+ * virt-install: new –memdev option (Pavel Hrdina)
+ * virt-install: add –disk logical/physical_block_size (Yuri Arabadji)
+ * virt-install: add –features hyperv_reset=, hyperv_synic= (Venkat Datta N H)
+- Dropped the following patches contained in new tarball
+ f5d709d9-lang-it-1.patch
+ c66098f3-lang-it-2.patch
+ 452a693e-lang-update.patch
+ 6b5106ea-lang-it-ko-fix.patch
+ 9c8ffe51-fix-multiple-warnings-1.patch
+ cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch
+ 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch
+ f341352c-remove-redundant-error-string.patch
+ ff3b4dc5-dont-overwrite-install-bootorder.patch
+ 2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch
+ 93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch
+ 7aee124d-fix-multiple-warnings-2.patch
+ f38c56c9-add-support-for-SMM-feature.patch
+ 24f9d053-add-support-for-loader-secure-attribute.patch
+
4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch
+ b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch
+ virtinst-expand-combobox.patch
+
+-------------------------------------------------------------------
+Tue Aug 1 20:02:58 UTC 2017 - jfeh...@suse.com
+
+- Add a supportconfig plugin
+ virt-manager-supportconfig
+ FATE#323661
+
+-------------------------------------------------------------------
Old:
----
0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch
2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch
24f9d053-add-support-for-loader-secure-attribute.patch
452a693e-lang-update.patch
4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch
6b5106ea-lang-it-ko-fix.patch
7aee124d-fix-multiple-warnings-2.patch
93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch
9c8ffe51-fix-multiple-warnings-1.patch
b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch
c66098f3-lang-it-2.patch
cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch
f341352c-remove-redundant-error-string.patch
f38c56c9-add-support-for-SMM-feature.patch
f5d709d9-lang-it-1.patch
ff3b4dc5-dont-overwrite-install-bootorder.patch
virt-manager-1.4.1.tar.bz2
virtinst-expand-combobox.patch
New:
----
virt-manager-1.4.2.tar.bz2
virt-manager-supportconfig
virtinst-check-date-format.patch
virtinst-no-usb-tablet-for-xenpv.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:48.124639114 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:48.128638553 +0200
@@ -23,11 +23,11 @@
%define libvirt_xen_packages ""
%define preferred_distros "sles12sp3,opensuse42.3"
%define kvm_packages ""
-%define _version 1.4.1
+%define _version 1.4.2
%define _release 0
Name: virt-manager
-Version: 1.4.1
+Version: 1.4.2
Release: 0
Summary: Virtual Machine Manager
License: GPL-2.0+
@@ -36,23 +36,8 @@
Source0: %{name}-%{version}.tar.bz2
Source1: virt-install.rb
Source2: virt-install.desktop
+Source3: virt-manager-supportconfig
# Upstream Patches
-Patch0: f5d709d9-lang-it-1.patch
-Patch1: c66098f3-lang-it-2.patch
-Patch2: 452a693e-lang-update.patch
-Patch3: 6b5106ea-lang-it-ko-fix.patch
-Patch4: 9c8ffe51-fix-multiple-warnings-1.patch
-Patch5:
cb182f7e-skip-authentication-only-for-VNC-with-listen-type-none.patch
-Patch6: 0610cd6a-ensure-bool-value-used-for-set_sensitive-call.patch
-Patch7: f341352c-remove-redundant-error-string.patch
-Patch8: ff3b4dc5-dont-overwrite-install-bootorder.patch
-Patch9:
2099a194-reset-guest-domain-to-none-on-domain-creation-error.patch
-Patch10:
93085d2b-reset-guest-domain-to-none-on-domain-creation-error.patch
-Patch11: 7aee124d-fix-multiple-warnings-2.patch
-Patch12: f38c56c9-add-support-for-SMM-feature.patch
-Patch13: 24f9d053-add-support-for-loader-secure-attribute.patch
-Patch14:
4f8e795c-if-required-by-UEFI-enable-SMM-feature-and-set-q35-machine-type.patch
-Patch15: b690908a-enable-secure-feature-together-with-smm-for-UEFI.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@@ -78,7 +63,6 @@
Patch127: virtinst-add-ppc64-arch-support.patch
Patch128: virtinst-s390x-disable-graphics.patch
Patch129: virtinst-add-caasp-support.patch
-Patch130: virtinst-expand-combobox.patch
# Bug Fixes
Patch150: virtman-prevent-double-click-starting-vm-twice.patch
Patch151: virtman-increase-setKeepAlive-count.patch
@@ -92,6 +76,8 @@
Patch163: virtinst-use-xenpae-kernel-for-32bit.patch
Patch164: virtinst-use-qemu-for-cdrom-device.patch
Patch165: virtinst-fix-sle-distro-parsing.patch
+Patch166: virtinst-check-date-format.patch
+Patch167: virtinst-no-usb-tablet-for-xenpv.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -174,22 +160,6 @@
%prep
%setup -q
# Upstream Patches
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
@@ -215,7 +185,6 @@
%patch127 -p1
%patch128 -p1
%patch129 -p1
-%patch130 -p1
# Bug Fixes
%patch150 -p1
%patch151 -p1
@@ -229,6 +198,8 @@
%patch163 -p1
%patch164 -p1
%patch165 -p1
+%patch166 -p1
+%patch167 -p1
%build
%if %{qemu_user}
@@ -276,6 +247,9 @@
install -m644 %SOURCE1
$RPM_BUILD_ROOT/%{_datadir}/YaST2/clients/virt-install.rb
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/
install -m644 %SOURCE2
$RPM_BUILD_ROOT/%{_datadir}/applications/YaST2/virt-install.desktop
+# Oddly, supportconfig doesn't execute plugins with '-' in the name, so use
'virt_manager'
+mkdir -p $RPM_BUILD_ROOT/usr/lib/supportconfig/plugins
+install -m 755 %SOURCE3
$RPM_BUILD_ROOT/usr/lib/supportconfig/plugins/virt_manager
%find_lang %{name}
@@ -317,6 +291,9 @@
%{_datadir}/applications/YaST2/virt-install.desktop
%{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml
%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert
+%dir /usr/lib/supportconfig
+%dir /usr/lib/supportconfig/plugins
+/usr/lib/supportconfig/plugins/virt_manager
%files common -f %{name}.lang
%defattr(-,root,root,-)
++++++ virt-manager-1.4.1.tar.bz2 -> virt-manager-1.4.2.tar.bz2 ++++++
++++ 241968 lines of diff (skipped)
++++++ virt-manager-supportconfig ++++++
#!/bin/bash
#############################################################
# Name: Supportconfig Plugin for virt-manager
# Description: Gathers important troubleshooting information
# about virt-manager
# Author: Jim Fehlig <jfeh...@suse.com>
#############################################################
RCFILE="/usr/lib/supportconfig/resources/scplugin.rc"
VIRTMAN_LOG_DIR="/root/.cache/virt-manager"
VIRTMAN_LOG_FILES=""
if [ -s $RCFILE ]; then
if ! source $RCFILE; then
echo "ERROR: Initializing resource file: $RCFILE" >&2
exit 1
fi
fi
rpm_verify() {
thisrpm="$1"
local ret=0
echo
echo "#==[ Validating RPM ]=================================#"
if rpm -q "$thisrpm" >/dev/null 2>&1; then
echo "# rpm -V $thisrpm"
if rpm -V "$thisrpm"; then
echo "Status: Passed"
else
echo "Status: WARNING"
fi
else
echo "package $thisrpm is not installed"
ret=1
fi
echo
return $ret
}
if ! rpm_verify virt-manager; then
echo "Skipped"
exit 0
fi
test -d $VIRTMAN_LOG_DIR && VIRTMAN_LOG_FILES="$(find -L $VIRTMAN_LOG_DIR/
-type f)"
plog_files 0 "$VIRTMAN_LOG_FILES"
echo "Done"
++++++ virtinst-add-caasp-support.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.620288804 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.636286559 +0200
@@ -1,9 +1,9 @@
References: bsc#1010060
-Index: virt-manager-1.4.1/virtinst/urlfetcher.py
+Index: virt-manager-1.4.2/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.1/virtinst/urlfetcher.py
+--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -464,6 +464,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLESDistro
if distro_version is None:
@@ -15,7 +15,7 @@
elif re.match(".*openSUSE.*", distribution[1]):
dclass = OpensuseDistro
if distro_version is None:
-@@ -1021,7 +1025,8 @@ class SuseDistro(Distro):
+@@ -1026,7 +1030,8 @@ class SuseDistro(Distro):
distro_version = self.version_from_content[1].strip()
version = distro_version.split('.', 1)[0].strip()
self.os_variant = self.urldistro
@@ -25,7 +25,7 @@
if self.os_variant.startswith(("sles", "sled")):
sp_version = None
if len(distro_version.split('.', 1)) == 2:
-@@ -1035,6 +1040,8 @@ class SuseDistro(Distro):
+@@ -1040,6 +1045,8 @@ class SuseDistro(Distro):
self.os_variant += "tumbleweed"
else:
self.os_variant += distro_version
@@ -34,7 +34,7 @@
else:
self.os_variant += "9"
-@@ -1081,6 +1088,9 @@ class SLESDistro(SuseDistro):
+@@ -1086,6 +1093,9 @@ class SLESDistro(SuseDistro):
class SLEDDistro(SuseDistro):
urldistro = "sled"
++++++ virtinst-add-ppc64-arch-support.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.648284874 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.652284313 +0200
@@ -1,9 +1,9 @@
Reference: bnc#869024
Add s390x and ppc64 support
-Index: virt-manager-1.4.1/virtinst/urlfetcher.py
+Index: virt-manager-1.4.2/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.1/virtinst/urlfetcher.py
+--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -438,6 +438,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586"
elif cbuf.find("s390x") != -1:
@@ -15,7 +15,7 @@
def _parse_sle_distribution(d):
sle_version = d[1].strip().rsplit(' ')[4]
-@@ -991,10 +995,12 @@ class SuseDistro(Distro):
+@@ -996,10 +1000,12 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"
++++++ virtinst-check-date-format.patch ++++++
Fixes a bug caused by a bogus EOL date in an osinfo database file.
The bad date caused an exception in strptime.
Index: virt-manager-1.4.2/virtinst/osdict.py
===================================================================
--- virt-manager-1.4.2.orig/virtinst/osdict.py
+++ virt-manager-1.4.2/virtinst/osdict.py
@@ -363,8 +363,11 @@ class _OsVariant(object):
eol_date = self._os.get_eol_date_string()
if eol_date:
- return (datetime.datetime.strptime(eol_date, "%Y-%m-%d") >
- datetime.datetime.now())
+ try:
+ eol_valid = datetime.datetime.strptime(eol_date, "%Y-%m-%d")
+ return (eol_valid > datetime.datetime.now())
+ except Exception:
+ pass
if self.name == "fedora-unknown":
return False
++++++ virtinst-fix-sle-distro-parsing.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.696278138 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.696278138 +0200
@@ -1,9 +1,9 @@
References: bsc#1042709
-Index: virt-manager-1.4.1/virtinst/urlfetcher.py
+Index: virt-manager-1.4.2/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.1/virtinst/urlfetcher.py
+--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -444,9 +444,20 @@ def _distroFromSUSEContent(fetcher, arch
arch = "ppc64le"
@@ -28,7 +28,7 @@
return ['VERSION', sle_version]
dclass = GenericDistro
-@@ -1029,7 +1040,10 @@ class SuseDistro(Distro):
+@@ -1034,7 +1045,10 @@ class SuseDistro(Distro):
distro_version = self.version_from_content[1].strip()
version = distro_version.split('.', 1)[0].strip()
self.os_variant = self.urldistro
++++++ virtinst-modify-gui-defaults.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.708276453 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.708276453 +0200
@@ -3,15 +3,16 @@
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.4.1/virtManager/create.py
+Index: virt-manager-1.4.2/virtManager/create.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/create.py
-+++ virt-manager-1.4.1/virtManager/create.py
-@@ -377,7 +377,19 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/create.py
++++ virt-manager-1.4.2/virtManager/create.py
+@@ -397,8 +397,20 @@ class vmmCreate(vmmGObjectUI):
self.widget("method-local").set_active(True)
self.widget("create-conn").set_active(-1)
activeconn = self._populate_conn_list(urihint)
- self.widget("arch-expander").set_expanded(False)
+ self.widget("vz-virt-type-hvm").set_active(True)
+ # For Xen have the expander open so users can see PV is the default
+ if activeconn and activeconn.is_xen():
+ self.widget("arch-expander").set_expanded(True)
@@ -28,11 +29,11 @@
if self._set_conn(activeconn) is False:
return False
-Index: virt-manager-1.4.1/virtManager/netlist.py
+Index: virt-manager-1.4.2/virtManager/netlist.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/netlist.py
-+++ virt-manager-1.4.1/virtManager/netlist.py
-@@ -167,9 +167,19 @@ class vmmNetworkList(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/netlist.py
++++ virt-manager-1.4.2/virtManager/netlist.py
+@@ -170,9 +170,19 @@ class vmmNetworkList(vmmGObjectUI):
return rows, vnet_bridges, default_label
def _find_physical_devices(self, vnet_bridges):
@@ -52,7 +53,7 @@
skip_ifaces = ["lo"]
vnet_taps = []
-@@ -229,10 +239,18 @@ class vmmNetworkList(vmmGObjectUI):
+@@ -232,10 +242,18 @@ class vmmNetworkList(vmmGObjectUI):
if can_default and not default_label:
default_label = label
++++++ virtinst-nfs-install-sanitize.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.732273085 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.732273085 +0200
@@ -5,11 +5,11 @@
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.4.1/virtinst/util.py
+Index: virt-manager-1.4.2/virtinst/util.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/util.py
-+++ virt-manager-1.4.1/virtinst/util.py
-@@ -447,3 +447,22 @@ def getInstallRepos():
+--- virt-manager-1.4.2.orig/virtinst/util.py
++++ virt-manager-1.4.2/virtinst/util.py
+@@ -421,3 +421,22 @@ def getInstallRepos():
return (0, [])
return lookupZypperRepos(getHostInstallSource())
@@ -32,10 +32,10 @@
+
+ return url
+
-Index: virt-manager-1.4.1/virtinst/distroinstaller.py
+Index: virt-manager-1.4.2/virtinst/distroinstaller.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/distroinstaller.py
-+++ virt-manager-1.4.1/virtinst/distroinstaller.py
+--- virt-manager-1.4.2.orig/virtinst/distroinstaller.py
++++ virt-manager-1.4.2/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,10 +45,10 @@
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.4.1/virtinst/urlfetcher.py
+Index: virt-manager-1.4.2/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.1/virtinst/urlfetcher.py
+--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -34,6 +34,7 @@ import urlparse
import requests
++++++ virtinst-no-usb-tablet-for-xenpv.patch ++++++
With 1.4.2 the code no longer checks for xenpv when adding
a usb tablet which is only supported on xen hvm.
--- virt-manager-1.4.2/virtinst/guest.py.orig 2017-08-09 11:47:19.812789816
-0600
+++ virt-manager-1.4.2/virtinst/guest.py 2017-08-09 11:49:36.023630599
-0600
@@ -659,7 +659,7 @@ class Guest(XMLBuilder):
usb_tablet = False
usb_keyboard = False
- if self.os.is_x86():
+ if self.os.is_x86() and not self.os.is_xenpv():
usb_tablet = self._os_object.supports_usbtablet()
if self.os.is_arm_machvirt():
usb_tablet = True
++++++ virtinst-pvgrub2-bootloader.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.760269156 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.760269156 +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.4.1/virtinst/guest.py
+Index: virt-manager-1.4.2/virtinst/guest.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/guest.py
-+++ virt-manager-1.4.1/virtinst/guest.py
-@@ -363,8 +363,20 @@ class Guest(XMLBuilder):
+--- virt-manager-1.4.2.orig/virtinst/guest.py
++++ virt-manager-1.4.2/virtinst/guest.py
+@@ -365,8 +365,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.4.1/virtinst/installer.py
+Index: virt-manager-1.4.2/virtinst/installer.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/installer.py
-+++ virt-manager-1.4.1/virtinst/installer.py
+--- virt-manager-1.4.2.orig/virtinst/installer.py
++++ virt-manager-1.4.2/virtinst/installer.py
@@ -99,7 +99,7 @@ class Installer(object):
break
return bootorder
++++++ virtinst-s390x-disable-graphics.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.784265787 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.788265225 +0200
@@ -1,9 +1,9 @@
Reference: bnc#869024
Disable graphics on s390x
-Index: virt-manager-1.4.1/virtinst/guest.py
+Index: virt-manager-1.4.2/virtinst/guest.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/guest.py
-+++ virt-manager-1.4.1/virtinst/guest.py
+--- virt-manager-1.4.2.orig/virtinst/guest.py
++++ virt-manager-1.4.2/virtinst/guest.py
@@ -124,7 +124,10 @@ class Guest(XMLBuilder):
self.skip_default_channel = False
self.skip_default_sound = False
@@ -16,7 +16,7 @@
self.skip_default_rng = False
self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
-@@ -647,7 +650,7 @@ class Guest(XMLBuilder):
+@@ -686,7 +689,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
-@@ -685,6 +688,8 @@ class Guest(XMLBuilder):
+@@ -741,6 +744,8 @@ class Guest(XMLBuilder):
dev.target_type = "virtio"
dev.target_name = dev.CHANNEL_NAME_QEMUGA
self.add_device(dev)
@@ -34,18 +34,18 @@
def add_default_graphics(self):
if self.skip_default_graphics:
-@@ -693,7 +698,7 @@ class Guest(XMLBuilder):
+@@ -749,7 +754,7 @@ class Guest(XMLBuilder):
return
- if self.os.is_container():
+ if self.os.is_container() and not self.conn.is_vz():
return
-- if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64"]:
-+ if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64",
"s390x"]:
+- if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le"]:
++ if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le",
"s390x"]:
return
self.add_device(VirtualGraphics(self.conn))
-@@ -1031,7 +1036,7 @@ class Guest(XMLBuilder):
- if self._hv_only_supports_virtio():
- return True
+@@ -1084,7 +1089,7 @@ class Guest(XMLBuilder):
+ if not os_support:
+ return False
- if self.os.is_x86():
+ if self.os.is_x86() or self.os.is_s390x():
++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.808262419 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.812261857 +0200
@@ -1,10 +1,10 @@
Set cache mode for target installation disk to unsafe for better
performance.
-Index: virt-manager-1.4.1/virtinst/guest.py
+Index: virt-manager-1.4.2/virtinst/guest.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/guest.py
-+++ virt-manager-1.4.1/virtinst/guest.py
-@@ -359,6 +359,17 @@ class Guest(XMLBuilder):
+--- virt-manager-1.4.2.orig/virtinst/guest.py
++++ virt-manager-1.4.2/virtinst/guest.py
+@@ -361,6 +361,17 @@ class Guest(XMLBuilder):
self._set_osxml_defaults()
@@ -22,7 +22,7 @@
self.bootloader = None
if (not install and
self.os.is_xenpv() and
-@@ -378,7 +389,10 @@ class Guest(XMLBuilder):
+@@ -380,7 +391,10 @@ class Guest(XMLBuilder):
self.installer.alter_bootconfig(self, True, True)
logging.info("Using grub.xen to boot guest")
++++++ virtinst-set-qemu-emulator.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.824260173 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.828259612 +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.4.1/virtinst/guest.py
+Index: virt-manager-1.4.2/virtinst/guest.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/guest.py
-+++ virt-manager-1.4.1/virtinst/guest.py
-@@ -844,14 +844,11 @@ class Guest(XMLBuilder):
+--- virt-manager-1.4.2.orig/virtinst/guest.py
++++ virt-manager-1.4.2/virtinst/guest.py
+@@ -895,14 +895,11 @@ class Guest(XMLBuilder):
self.emulator = None
return
++++++ virtinst-storage-ocfs2.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.836258489 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.840257927 +0200
@@ -1,9 +1,9 @@
Enhancement to add ocfs2 as a supported FS type
-Index: virt-manager-1.4.1/virtinst/storage.py
+Index: virt-manager-1.4.2/virtinst/storage.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/storage.py
-+++ virt-manager-1.4.1/virtinst/storage.py
-@@ -462,7 +462,7 @@ class StoragePool(_StorageObject):
+--- virt-manager-1.4.2.orig/virtinst/storage.py
++++ virt-manager-1.4.2/virtinst/storage.py
+@@ -467,7 +467,7 @@ class StoragePool(_StorageObject):
def list_formats(self):
if self.type == self.TYPE_FS:
return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
++++++ virtinst-use-qemu-for-cdrom-device.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.852256243 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.856255682 +0200
@@ -2,11 +2,11 @@
When the device added is a cdrom device (/dev/sr0), don't use
"phy" as the driver name but instead use "qemu".
-Index: virt-manager-1.4.0/virtinst/devicedisk.py
+Index: virt-manager-1.4.2/virtinst/devicedisk.py
===================================================================
---- virt-manager-1.4.0.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.0/virtinst/devicedisk.py
-@@ -550,7 +550,8 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.4.2.orig/virtinst/devicedisk.py
++++ virt-manager-1.4.2/virtinst/devicedisk.py
+@@ -552,7 +552,8 @@ class VirtualDisk(VirtualDevice):
# Recommended xen defaults from here:
# https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9
# If type block, use name=phy. Otherwise do the same as qemu
++++++ virtinst-use-xenpae-kernel-for-32bit.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.868253998 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.872253437 +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.4.1/virtinst/urlfetcher.py
+Index: virt-manager-1.4.2/virtinst/urlfetcher.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.1/virtinst/urlfetcher.py
-@@ -1018,8 +1018,12 @@ class SuseDistro(Distro):
+--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.4.2/virtinst/urlfetcher.py
+@@ -1023,8 +1023,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.biykfn/_old 2017-08-16 16:13:50.888251191 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.888251191 +0200
@@ -4,11 +4,11 @@
Signed-off-by: Chunyan Liu <cy...@suse.com>
-Index: virt-manager-1.4.1/virtinst/storage.py
+Index: virt-manager-1.4.2/virtinst/storage.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/storage.py
-+++ virt-manager-1.4.1/virtinst/storage.py
-@@ -701,6 +701,12 @@ class StorageVolume(_StorageObject):
+--- virt-manager-1.4.2.orig/virtinst/storage.py
++++ virt-manager-1.4.2/virtinst/storage.py
+@@ -708,6 +708,12 @@ class StorageVolume(_StorageObject):
return self._pool_xml.get_disk_type()
file_type = property(_get_vol_type)
@@ -21,14 +21,14 @@
##################
# XML properties #
-Index: virt-manager-1.4.1/virtinst/support.py
+Index: virt-manager-1.4.2/virtinst/support.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/support.py
-+++ virt-manager-1.4.1/virtinst/support.py
-@@ -321,6 +321,8 @@ SUPPORT_CONN_VIDEO_VIRTIO_ACCEL3D = _mak
- hv_version={"qemu": "2.5.0", "test": 0})
- SUPPORT_CONN_GRAPHICS_LISTEN_NONE = _make(version="2.0.0")
- SUPPORT_CONN_RNG_URANDOM = _make(version="1.3.4")
+--- virt-manager-1.4.2.orig/virtinst/support.py
++++ virt-manager-1.4.2/virtinst/support.py
+@@ -324,6 +324,8 @@ SUPPORT_CONN_RNG_URANDOM = _make(version
+ SUPPORT_CONN_USB3_PORTS = _make(version="1.3.5")
+ SUPPORT_CONN_MACHVIRT_PCI_DEFAULT = _make(version="3.0.0")
+ SUPPORT_CONN_QEMU_XHCI = _make(version="3.3.0")
+SUPPORT_CONN_NOCOW = _make(
+ version="1.2.18", hv_version={"qemu": "2.2.0", "test": 0})
++++++ virtinst-xen-drive-type.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.912247822 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.912247822 +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.4.0/virtinst/devicedisk.py
+Index: virt-manager-1.4.2/virtinst/devicedisk.py
===================================================================
---- virt-manager-1.4.0.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.0/virtinst/devicedisk.py
-@@ -568,6 +568,10 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.4.2.orig/virtinst/devicedisk.py
++++ virt-manager-1.4.2/virtinst/devicedisk.py
+@@ -570,6 +570,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.biykfn/_old 2017-08-16 16:13:50.940243893 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.944243332 +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.4.0/virtinst/devicedisk.py
+Index: virt-manager-1.4.2/virtinst/devicedisk.py
===================================================================
---- virt-manager-1.4.0.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.0/virtinst/devicedisk.py
-@@ -993,6 +993,17 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.4.2.orig/virtinst/devicedisk.py
++++ virt-manager-1.4.2/virtinst/devicedisk.py
+@@ -1003,6 +1003,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()
-@@ -1006,7 +1017,12 @@ class VirtualDisk(VirtualDevice):
+@@ -1016,7 +1027,12 @@ class VirtualDisk(VirtualDevice):
ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
for i in ran:
++++++ virtman-add-connect-default.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:50.956241647 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:50.964240524 +0200
@@ -1,11 +1,11 @@
Enhancement for when no hypervisor can be found locally it opens
the new connection dialog.
-Index: virt-manager-1.3.2/virtManager/engine.py
+Index: virt-manager-1.4.2/virtManager/engine.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/engine.py
-+++ virt-manager-1.3.2/virtManager/engine.py
+--- virt-manager-1.4.2.orig/virtManager/engine.py
++++ virt-manager-1.4.2/virtManager/engine.py
@@ -236,9 +236,6 @@ class vmmEngine(vmmGObject):
- except:
+ except Exception:
logging.exception("Error talking to PackageKit")
- if tryuri is None:
++++++ virtman-allow-creating-i686-vm.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.000235472 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.000235472 +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.4.1/virtManager/create.py
+Index: virt-manager-1.4.2/virtManager/create.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/create.py
-+++ virt-manager-1.4.1/virtManager/create.py
-@@ -781,11 +781,6 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/create.py
++++ virt-manager-1.4.2/virtManager/create.py
+@@ -847,11 +847,6 @@ class vmmCreate(vmmGObjectUI):
for guest in self.conn.caps.guests:
if guest.os_type == self._capsinfo.os_type:
archs.append(guest.arch)
++++++ virtman-check-for-valid-display.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.028231542 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.028231542 +0200
@@ -1,11 +1,11 @@
References: bnc#907958
Sanity check for those who forget '-X' on ssh and try to start virt-manager
-Index: virt-manager-1.4.0/virt-manager
+Index: virt-manager-1.4.2/virt-manager
===================================================================
---- 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."
+--- virt-manager-1.4.2.orig/virt-manager
++++ virt-manager-1.4.2/virt-manager
+@@ -81,8 +81,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
++++++ virtman-default-guest-from-host-os.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.044229297 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.044229297 +0200
@@ -1,11 +1,11 @@
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.4.1/virtManager/create.py
+Index: virt-manager-1.4.2/virtManager/create.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/create.py
-+++ virt-manager-1.4.1/virtManager/create.py
-@@ -21,6 +21,9 @@
- import logging
+--- virt-manager-1.4.2.orig/virtManager/create.py
++++ virt-manager-1.4.2/virtManager/create.py
+@@ -24,6 +24,9 @@ import os
+ import cStringIO
import threading
import time
+import sys
@@ -14,16 +14,7 @@
from gi.repository import GObject
from gi.repository import Gtk
-@@ -968,7 +971,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,
-- only_supported=True)
-+ only_supported=False)
-
- for v in variants:
- supported = v in supportl or v.name == "generic"
-@@ -1324,6 +1327,63 @@ class vmmCreate(vmmGObjectUI):
+@@ -1505,6 +1508,63 @@ class vmmCreate(vmmGObjectUI):
def _cdrom_changed(self, src):
self._detectable_media_widget_changed(src)
@@ -87,7 +78,7 @@
def _toggle_detect_os(self, src):
dodetect = src.get_active()
-@@ -1336,6 +1396,8 @@ class vmmCreate(vmmGObjectUI):
+@@ -1517,6 +1577,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.biykfn/_old 2017-08-16 16:13:51.068225928 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.068225928 +0200
@@ -1,9 +1,9 @@
Enhancement to default to PV instead of HVM on Xen host.
-Index: virt-manager-1.4.1/virtManager/create.py
+Index: virt-manager-1.4.2/virtManager/create.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/create.py
-+++ virt-manager-1.4.1/virtManager/create.py
-@@ -691,7 +691,12 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/create.py
++++ virt-manager-1.4.2/virtManager/create.py
+@@ -757,7 +757,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.biykfn/_old 2017-08-16 16:13:51.088223121 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.088223121 +0200
@@ -1,11 +1,11 @@
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.4.0/virtManager/delete.py
+Index: virt-manager-1.4.2/virtManager/delete.py
===================================================================
---- 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,
+--- virt-manager-1.4.2.orig/virtManager/delete.py
++++ virt-manager-1.4.2/virtManager/delete.py
+@@ -239,7 +239,7 @@ def populate_storage_list(storage_list,
diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True))
for target, path, ro, shared, is_media in diskdata:
++++++ virtman-increase-setKeepAlive-count.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.120218630 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.124218068 +0200
@@ -2,16 +2,16 @@
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.4.1/virtManager/connection.py
+Index: virt-manager-1.4.2/virtManager/connection.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/connection.py
-+++ virt-manager-1.4.1/virtManager/connection.py
-@@ -1051,7 +1051,7 @@ class vmmConnection(vmmGObject):
- self.caps.get_cpu_values("x86_64")
+--- virt-manager-1.4.2.orig/virtManager/connection.py
++++ virt-manager-1.4.2/virtManager/connection.py
+@@ -1076,7 +1076,7 @@ class vmmConnection(vmmGObject):
+ self.caps.get_cpu_values(self.caps.host.cpu.arch)
try:
- self._backend.setKeepAlive(20, 1)
+ self._backend.setKeepAlive(20, 10)
- except Exception, e:
+ except Exception as e:
if (type(e) is not AttributeError and
not util.is_error_nosupport(e)):
++++++ virtman-kvm.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.144215261 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.144215261 +0200
@@ -1,10 +1,10 @@
/usr/bin/kvm doesn't exist on suse distros so check instead for
/usr/bin/qemu-system-x86_64
-Index: virt-manager-1.3.0/virtManager/connect.py
+Index: virt-manager-1.4.2/virtManager/connect.py
===================================================================
---- virt-manager-1.3.0.orig/virtManager/connect.py
-+++ virt-manager-1.3.0/virtManager/connect.py
-@@ -114,7 +114,7 @@ class vmmConnect(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/connect.py
++++ virt-manager-1.4.2/virtManager/connect.py
+@@ -116,7 +116,7 @@ class vmmConnect(vmmGObjectUI):
if (os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or
++++++ virtman-libvirtd-not-running.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.164212455 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.168211893 +0200
@@ -1,9 +1,9 @@
Use the correct systemd to start libvirt.
-Index: virt-manager-1.3.2/virtManager/packageutils.py
+Index: virt-manager-1.4.2/virtManager/packageutils.py
===================================================================
---- virt-manager-1.3.2.orig/virtManager/packageutils.py
-+++ virt-manager-1.3.2/virtManager/packageutils.py
-@@ -143,8 +143,8 @@ def start_libvirtd():
+--- virt-manager-1.4.2.orig/virtManager/packageutils.py
++++ virt-manager-1.4.2/virtManager/packageutils.py
+@@ -145,8 +145,8 @@ def start_libvirtd():
logging.debug("libvirtd not running, asking system-config-services "
"to start it")
scs = Gio.DBusProxy.new_sync(bus, 0, None,
++++++ virtman-packages.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.184209648 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.184209648 +0200
@@ -4,10 +4,10 @@
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.4.0/setup.py
+Index: virt-manager-1.4.2/setup.py
===================================================================
---- virt-manager-1.4.0.orig/setup.py
-+++ virt-manager-1.4.0/setup.py
+--- virt-manager-1.4.2.orig/setup.py
++++ virt-manager-1.4.2/setup.py
@@ -308,8 +308,11 @@ class configure(distutils.core.Command):
("prefix=", None, "installation prefix"),
("qemu-user=", None,
@@ -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.4.0/virtcli/cliconfig.py
+Index: virt-manager-1.4.2/virtcli/cliconfig.py
===================================================================
---- virt-manager-1.4.0.orig/virtcli/cliconfig.py
-+++ virt-manager-1.4.0/virtcli/cliconfig.py
+--- virt-manager-1.4.2.orig/virtcli/cliconfig.py
++++ virt-manager-1.4.2/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.4.0/virtManager/config.py
+Index: virt-manager-1.4.2/virtManager/config.py
===================================================================
---- virt-manager-1.4.0.orig/virtManager/config.py
-+++ virt-manager-1.4.0/virtManager/config.py
+--- virt-manager-1.4.2.orig/virtManager/config.py
++++ virt-manager-1.4.2/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,11 +73,11 @@
self.askpass_package = CLIConfig.askpass_package
self.default_graphics_from_config = CLIConfig.default_graphics
self.default_hvs = CLIConfig.default_hvs
-Index: virt-manager-1.4.0/virtManager/engine.py
+Index: virt-manager-1.4.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):
+--- virt-manager-1.4.2.orig/virtManager/engine.py
++++ virt-manager-1.4.2/virtManager/engine.py
+@@ -226,22 +226,18 @@ class vmmEngine(vmmGObject):
ret = None
try:
@@ -90,12 +90,13 @@
+ packages = self.config.libvirt_kvm_packages +
self.config.hv_packages
ret = packageutils.check_packagekit(manager, manager.err,
packages)
- except:
+ except Exception:
logging.exception("Error talking to PackageKit")
+- tryuri = None
- if ret:
- tryuri = "qemu:///system"
-- else:
+- elif not self.config.test_first_run:
- tryuri = vmmConnect.default_uri()
-
if tryuri is None:
++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.196207963 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.200207402 +0200
@@ -3,11 +3,11 @@
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.4.1/virtManager/details.py
+Index: virt-manager-1.4.2/virtManager/details.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/details.py
-+++ virt-manager-1.4.1/virtManager/details.py
-@@ -1459,6 +1459,9 @@ class vmmDetails(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/details.py
++++ virt-manager-1.4.2/virtManager/details.py
+@@ -1451,6 +1451,9 @@ class vmmDetails(vmmGObjectUI):
def control_vm_run(self, src_ignore):
if self.has_unapplied_changes(self.get_hw_row()):
return
++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.biykfn/_old 2017-08-16 16:13:51.220204595 +0200
+++ /var/tmp/diff_new_pack.biykfn/_new 2017-08-16 16:13:51.224204034 +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.4.1/virtManager/create.py
+Index: virt-manager-1.4.2/virtManager/create.py
===================================================================
---- virt-manager-1.4.1.orig/virtManager/create.py
-+++ virt-manager-1.4.1/virtManager/create.py
-@@ -403,7 +403,13 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.4.2.orig/virtManager/create.py
++++ virt-manager-1.4.2/virtManager/create.py
+@@ -424,7 +424,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.4.1/virtinst/util.py
+Index: virt-manager-1.4.2/virtinst/util.py
===================================================================
---- virt-manager-1.4.1.orig/virtinst/util.py
-+++ virt-manager-1.4.1/virtinst/util.py
+--- virt-manager-1.4.2.orig/virtinst/util.py
++++ virt-manager-1.4.2/virtinst/util.py
@@ -23,9 +23,12 @@ import os
import random
import re
@@ -38,7 +38,7 @@
def listify(l):
if l is None:
-@@ -343,3 +346,104 @@ def make_meter(quiet):
+@@ -317,3 +320,104 @@ def make_meter(quiet):
if quiet:
return progress.BaseMeter()
return progress.TextMeter(fo=sys.stdout)
