Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2016-01-08 15:23:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-18 22:34:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2016-01-08 15:23:19.000000000 +0100 @@ -1,0 +2,70 @@ +Mon Jan 4 11:04:50 MST 2016 - carn...@suse.com + +- Drop including gschemas.compiled and icon-theme.cache. + virt-manager.spec + +------------------------------------------------------------------- +Fri Dec 25 09:44:35 UTC 2015 - br...@ioda-net.ch + +- Update to 1.3.2 upstream bugfix release + virt-manager-1.3.2.tar.bz2 + * Fix dependency issues with vte (bz #1290262) +- Dropped + virt-manager-1.3.0.tar.bz2 +-Fix boo#959049 + Namespace Vte not available for version 2.91 + +------------------------------------------------------------------- +Sun Dec 13 14:41:54 UTC 2015 - br...@ioda-net.ch + +- Update to 1.3.1 release upstream bugfix + virt-manager-1.3.1.tar.bz2 + * Fix command line API on RHEL7 pygobject +- Dropped + virt-manager-1.3.0.tar.bz2 +- Fix boo#958094 + Error starting Virtual Machine Manager: new_sync() takes exactly + 7 arguments (6 given) +- redone patch 104 virtman-load-stored-uris.patch + +------------------------------------------------------------------- +Wed Nov 25 09:46:33 MST 2015 - carn...@suse.com + +- Update to virt-manager 1.3.0 + virt-manager-1.3.0.tar.bz2 + * Git hosting moved to http://github.com/virt-manager/virt-manager + * Switch translation infrastructure from transifex to fedora.zanata.org + * Add dogtail UI tests and infrastructure + * Improved support for s390x kvm (Kevin Zhao) + * virt-install and virt-manager now remove created disk images if VM install startup fails + * Replace urlgrabber usage with requests and urllib2 + * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange) + * virt-install: support multiple –security labels + * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina) + * virt-install: add –features pmu=on|off + * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde) + * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde) + * virt-install: add –network link_state=up|down + * virt-install: add –vcpu placement=static|auto +- Dropped + virt-manager-1.2.1.tar.bz2 + 34db1af7-fix-adding-iscsi-pools.patch + 360fe110-add-s390x-arch-support.patch + 4970615f-fix-qemu-vs-lxc-detection.patch + 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch + 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch + 601a82cb-fix-console_type-if-xen.patch + 76bad650-fix-virt-xml-define-and-update.patch + 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch + 8dbe96fc-add-s390x-arch-support.patch + a9b303fb-fix-copy-host-cpu-definition.patch + aebebbf8-report-an-error-for-pxe-install-without-network.patch + cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch + eb92178e-virtinst-fix-storage-pool-lookup.patch + f30975c3-drop-cow-support.patch + f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch + fc93e154-fix-udp-tcp-host-vs-mode-UI.patch + virtman-autoyast-support.patch + virtman-supported-disk-formats.patch + +------------------------------------------------------------------- Old: ---- 34db1af7-fix-adding-iscsi-pools.patch 360fe110-add-s390x-arch-support.patch 4970615f-fix-qemu-vs-lxc-detection.patch 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch 601a82cb-fix-console_type-if-xen.patch 76bad650-fix-virt-xml-define-and-update.patch 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch 8dbe96fc-add-s390x-arch-support.patch a9b303fb-fix-copy-host-cpu-definition.patch aebebbf8-report-an-error-for-pxe-install-without-network.patch cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch eb92178e-virtinst-fix-storage-pool-lookup.patch f30975c3-drop-cow-support.patch f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch fc93e154-fix-udp-tcp-host-vs-mode-UI.patch virt-manager-1.2.1.tar.bz2 virtman-autoyast-support.patch virtman-supported-disk-formats.patch New: ---- virt-manager-1.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:23.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,13 @@ %define qemu_user "qemu" %define libvirt_kvm_packages "" %define libvirt_xen_packages "" -%define preferred_distros "sles12,opensuse13.2" +%define preferred_distros "sles12sp1,opensuse42.1" %define kvm_packages "" -%define _version 1.2.1 -%define _release 1 +%define _version 1.3.2 +%define _release 0 Name: virt-manager -Version: 1.2.1 +Version: 1.3.2 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0+ @@ -37,22 +37,6 @@ Source1: virt-install.rb Source2: virt-install.desktop # Upstream Patches -Patch1: 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch -Patch2: fc93e154-fix-udp-tcp-host-vs-mode-UI.patch -Patch3: 34db1af7-fix-adding-iscsi-pools.patch -Patch4: 76bad650-fix-virt-xml-define-and-update.patch -Patch5: a9b303fb-fix-copy-host-cpu-definition.patch -Patch6: 8dbe96fc-add-s390x-arch-support.patch -Patch7: f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch -Patch8: aebebbf8-report-an-error-for-pxe-install-without-network.patch -Patch9: 4970615f-fix-qemu-vs-lxc-detection.patch -Patch10: eb92178e-virtinst-fix-storage-pool-lookup.patch -Patch11: 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch -Patch12: 360fe110-add-s390x-arch-support.patch -Patch13: 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch -Patch14: 601a82cb-fix-console_type-if-xen.patch -Patch15: f30975c3-drop-cow-support.patch -Patch16: cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -66,10 +50,9 @@ Patch100: virtman-eepro100.patch Patch101: virtman-default-guest-from-host-os.patch Patch102: virtman-default-to-xen-pv.patch -Patch103: virtman-autoyast-support.patch -Patch104: virtman-packages.patch -Patch105: virtman-load-stored-uris.patch -Patch106: virtman-add-connect-default.patch +Patch103: virtman-packages.patch +Patch104: virtman-load-stored-uris.patch +Patch105: virtman-add-connect-default.patch Patch120: virtinst-storage-ocfs2.patch Patch121: virtinst-default-xen-to-qcow2-format.patch Patch122: virtinst-detect-oes-distros.patch @@ -81,12 +64,11 @@ Patch128: virtinst-add-ppc64-arch-support.patch Patch129: virtinst-s390x-disable-graphics.patch # Bug Fixes -Patch150: virtman-supported-disk-formats.patch -Patch151: virtman-prevent-double-click-starting-vm-twice.patch -Patch152: virtman-increase-setKeepAlive-count.patch -Patch153: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch -Patch154: virtman-check-for-valid-display.patch -Patch155: virtman-allow-creating-i686-vm.patch +Patch150: virtman-prevent-double-click-starting-vm-twice.patch +Patch151: virtman-increase-setKeepAlive-count.patch +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 Patch160: virtinst-xen-drive-type.patch Patch161: virtinst-xenbus-disk-index-fix.patch Patch162: virtinst-refresh_before_fetch_pool.patch @@ -112,6 +94,7 @@ %endif BuildRequires: glib2-devel +BuildRequires: gtk2-tools BuildRequires: intltool BuildRequires: perl BuildRequires: python @@ -158,6 +141,7 @@ Requires: virt-manager-common = %{verrel} +Requires: python-requests Provides: python-virtinst Provides: virt-clone Provides: virt-convert @@ -173,22 +157,6 @@ %prep %setup -q # Upstream Patches -%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 -%patch16 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 @@ -205,7 +173,6 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 %patch120 -p1 %patch121 -p1 %patch122 -p1 @@ -222,7 +189,6 @@ %patch152 -p1 %patch153 -p1 %patch154 -p1 -%patch155 -p1 %patch160 -p1 %patch161 -p1 %patch162 -p1 @@ -265,7 +231,9 @@ %{?_default_graphics} %install -python setup.py install \ +python setup.py \ + --no-update-icon-cache \ + --no-compile-schemas install \ --prefix=%{_prefix} \ -O1 --root=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/YaST2/clients/ ++++++ virt-manager-1.2.1.tar.bz2 -> virt-manager-1.3.2.tar.bz2 ++++++ ++++ 270712 lines of diff (skipped) ++++++ virtinst-add-default-rng-device.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ References: bnc#885308 Enhancement to add a virtio RNG device to non windows VMs. -Index: virt-manager-1.2.1/virtinst/guest.py +Index: virt-manager-1.3.0/virtinst/guest.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/guest.py -+++ virt-manager-1.2.1/virtinst/guest.py +--- virt-manager-1.3.0.orig/virtinst/guest.py ++++ virt-manager-1.3.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): -@@ -674,6 +675,15 @@ class Guest(XMLBuilder): +@@ -711,6 +712,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() -@@ -681,6 +691,7 @@ class Guest(XMLBuilder): +@@ -718,6 +728,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.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,10 +1,10 @@ Reference: bnc#869024 Add s390x and ppc64 support -Index: virt-manager-1.2.1/virtinst/urlfetcher.py +Index: virt-manager-1.3.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.2.1/virtinst/urlfetcher.py -@@ -374,6 +374,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.0/virtinst/urlfetcher.py +@@ -427,6 +427,10 @@ def _distroFromSUSEContent(fetcher, arch arch = "i586" elif cbuf.find("s390x") != -1: arch = "s390x" @@ -15,7 +15,7 @@ dclass = GenericDistro if distribution: -@@ -943,10 +947,12 @@ class SuseDistro(Distro): +@@ -966,10 +970,12 @@ class SuseDistro(Distro): oldkern += "64" oldinit += "64" ++++++ virtinst-default-xen-to-qcow2-format.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Reference: bnc#885380 Allow Xen based VMs to default to using qcow2 -Index: virt-manager-1.1.0/virtinst/support.py +Index: virt-manager-1.3.0/virtinst/support.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/support.py -+++ virt-manager-1.1.0/virtinst/support.py +--- virt-manager-1.3.0.orig/virtinst/support.py ++++ virt-manager-1.3.0/virtinst/support.py @@ -258,7 +258,7 @@ SUPPORT_CONN_DISK_SD = _make(version="1. # default to qcow2. It might be fine for xen or qemu older than the versions # here, but until someone tests things I'm going to be a bit conservative. ++++++ virtinst-detect-oes-distros.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement to correctly detect Open Enterprise Server media is selected as the installation source. -Index: virt-manager-1.2.1/virtinst/urlfetcher.py +Index: virt-manager-1.3.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.2.1/virtinst/urlfetcher.py -@@ -386,6 +386,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.0/virtinst/urlfetcher.py +@@ -439,6 +439,10 @@ def _distroFromSUSEContent(fetcher, arch dclass = SLEDDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] ++++++ virtinst-modify-gui-defaults.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -3,14 +3,14 @@ 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.1.0/virtManager/create.py +Index: virt-manager-1.3.0/virtManager/create.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/create.py -+++ virt-manager-1.1.0/virtManager/create.py -@@ -331,7 +331,19 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/create.py ++++ virt-manager-1.3.0/virtManager/create.py +@@ -371,7 +371,19 @@ class vmmCreate(vmmGObjectUI): self.widget("method-local").set_active(True) self.widget("create-conn").set_active(-1) - activeconn = self.populate_conn_list(urihint) + activeconn = self._populate_conn_list(urihint) - self.widget("arch-expander").set_expanded(False) + # For Xen have the expander open so users can see PV is the default + if activeconn and activeconn.is_xen(): @@ -26,12 +26,12 @@ + self.widget("method-local").set_active(False) + self.widget("method-tree").set_active(True) - try: - self.set_conn(activeconn, force_validate=True) -Index: virt-manager-1.1.0/virtManager/netlist.py + if self._set_conn(activeconn) is False: + return False +Index: virt-manager-1.3.0/virtManager/netlist.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/netlist.py -+++ virt-manager-1.1.0/virtManager/netlist.py +--- virt-manager-1.3.0.orig/virtManager/netlist.py ++++ virt-manager-1.3.0/virtManager/netlist.py @@ -167,9 +167,19 @@ class vmmNetworkList(vmmGObjectUI): return rows, vnet_bridges, default_label @@ -70,4 +70,4 @@ + return rows, default_label - def _populate_network_list(self): + def _populate_network_model(self, model): ++++++ virtinst-nfs-install-sanitize.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -5,14 +5,14 @@ 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.2.1/virtinst/util.py +Index: virt-manager-1.3.0/virtinst/util.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/util.py -+++ virt-manager-1.2.1/virtinst/util.py -@@ -561,3 +561,22 @@ def getInstallRepos(enabled_sources_only - zypper_output.insert(0, dom0_inst_source) +--- virt-manager-1.3.0.orig/virtinst/util.py ++++ virt-manager-1.3.0/virtinst/util.py +@@ -552,3 +552,22 @@ def getInstallRepos(enabled_sources_only return (index_dom0, zypper_output) + +def sanitize_url(url): + """ + Do nothing for http or ftp, but make sure nfs is in the expected format @@ -32,11 +32,11 @@ + + return url + -Index: virt-manager-1.2.1/virtinst/distroinstaller.py +Index: virt-manager-1.3.0/virtinst/distroinstaller.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/distroinstaller.py -+++ virt-manager-1.2.1/virtinst/distroinstaller.py -@@ -51,6 +51,8 @@ def _sanitize_url(url): +--- virt-manager-1.3.0.orig/virtinst/distroinstaller.py ++++ virt-manager-1.3.0/virtinst/distroinstaller.py +@@ -49,6 +49,8 @@ def _sanitize_url(url): """ Do nothing for http or ftp, but make sure nfs is in the expected format """ @@ -45,25 +45,25 @@ 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.2.1/virtinst/urlfetcher.py +Index: virt-manager-1.3.0/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/urlfetcher.py -+++ virt-manager-1.2.1/virtinst/urlfetcher.py -@@ -33,6 +33,7 @@ import urlparse - import urlgrabber.grabber as grabber +--- virt-manager-1.3.0.orig/virtinst/urlfetcher.py ++++ virt-manager-1.3.0/virtinst/urlfetcher.py +@@ -33,6 +33,7 @@ import urllib2 + import urlparse from .osdict import OSDB +from virtinst import util ######################################################################### -@@ -219,7 +220,8 @@ class _MountedImageFetcher(_LocalImageFe +@@ -295,7 +296,8 @@ class _MountedURLFetcher(_LocalURLFetche - logging.debug("Preparing mount at " + self.srcdir) + logging.debug("Preparing mount at " + self._srcdir) if self.location.startswith("nfs:"): -- cmd = [mountcmd, "-o", "ro", self.location[4:], self.srcdir] +- cmd = [mountcmd, "-o", "ro", self.location[4:], self._srcdir] + url = util.sanitize_url(self.location) -+ cmd = [mountcmd, "-o", "ro", url[4:], self.srcdir] ++ cmd = [mountcmd, "-o", "ro", url[4:], self._srcdir] else: if stat.S_ISBLK(os.stat(self.location)[stat.ST_MODE]): mountopt = "ro" ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtinst/guest.py +Index: virt-manager-1.3.0/virtinst/guest.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/guest.py -+++ virt-manager-1.2.1/virtinst/guest.py -@@ -358,8 +358,19 @@ class Guest(XMLBuilder): +--- virt-manager-1.3.0.orig/virtinst/guest.py ++++ virt-manager-1.3.0/virtinst/guest.py +@@ -365,8 +365,19 @@ class Guest(XMLBuilder): if (not install and self.os.is_xenpv() and not self.os.kernel): @@ -28,10 +28,10 @@ return self.get_xml_config() -Index: virt-manager-1.2.1/virtinst/installer.py +Index: virt-manager-1.3.0/virtinst/installer.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/installer.py -+++ virt-manager-1.2.1/virtinst/installer.py +--- virt-manager-1.3.0.orig/virtinst/installer.py ++++ virt-manager-1.3.0/virtinst/installer.py @@ -99,7 +99,7 @@ class Installer(object): break return bootorder ++++++ virtinst-refresh_before_fetch_pool.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -13,14 +13,14 @@ Signed-off-by: Chunyan Liu <cy...@suse.com> -Index: virt-manager-1.1.0/virtinst/pollhelpers.py +Index: virt-manager-1.3.0/virtinst/pollhelpers.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/pollhelpers.py -+++ virt-manager-1.1.0/virtinst/pollhelpers.py -@@ -132,6 +132,19 @@ def fetch_pools(backend, origmap, build_ +--- virt-manager-1.3.0.orig/virtinst/pollhelpers.py ++++ virt-manager-1.3.0/virtinst/pollhelpers.py +@@ -133,6 +133,19 @@ def fetch_pools(backend, origmap, build_ if backend.check_support( - backend.SUPPORT_CONN_LISTALLSTORAGEPOOLS) and not _force_old_poll: + backend.SUPPORT_CONN_LISTALLSTORAGEPOOLS) and not FORCE_OLD_POLL: + + # Refresh pools before poll_helper. For those + # 'active' but target path not exist (or other reasons ++++++ virtinst-replace-unar-with-other-archivers.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -3,10 +3,10 @@ Until we do, keep this patch to execute the correct archiver program. -Index: virt-manager-1.2.1/virtconv/formats.py +Index: virt-manager-1.3.0/virtconv/formats.py =================================================================== ---- virt-manager-1.2.1.orig/virtconv/formats.py -+++ virt-manager-1.2.1/virtconv/formats.py +--- virt-manager-1.3.0.orig/virtconv/formats.py ++++ virt-manager-1.3.0/virtconv/formats.py @@ -118,6 +118,8 @@ def _find_input(input_file, parser, prin try: ext = os.path.splitext(input_file)[1] ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-1.2.1/virtinst/guest.py +Index: virt-manager-1.3.0/virtinst/guest.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/guest.py -+++ virt-manager-1.2.1/virtinst/guest.py +--- virt-manager-1.3.0.orig/virtinst/guest.py ++++ virt-manager-1.3.0/virtinst/guest.py @@ -123,7 +123,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False @@ -16,13 +16,7 @@ self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY self.__os_object = None -@@ -623,11 +626,13 @@ class Guest(XMLBuilder): - self.conn.check_support( - self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)): - dev.target_type = "virtio" -+ elif self.os.is_s390x(): -+ dev.target_type = "sclp" - +@@ -662,7 +665,7 @@ class Guest(XMLBuilder): self.add_device(dev) def add_default_video_device(self): @@ -31,7 +25,16 @@ return if self.get_devices("video"): return -@@ -672,7 +677,7 @@ class Guest(XMLBuilder): +@@ -700,6 +703,8 @@ class Guest(XMLBuilder): + dev.target_type = "virtio" + dev.target_name = dev.CHANNEL_NAME_QEMUGA + self.add_device(dev) ++ elif self.os.is_s390x(): ++ dev.target_type = "sclp" + + def add_default_graphics(self): + if self.skip_default_graphics: +@@ -708,7 +713,7 @@ class Guest(XMLBuilder): return if self.os.is_container(): return @@ -40,7 +43,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -1000,7 +1005,7 @@ class Guest(XMLBuilder): +@@ -1052,7 +1057,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.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-1.2.1/virtinst/guest.py +Index: virt-manager-1.3.0/virtinst/guest.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/guest.py -+++ virt-manager-1.2.1/virtinst/guest.py +--- virt-manager-1.3.0.orig/virtinst/guest.py ++++ virt-manager-1.3.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): -@@ -354,6 +355,17 @@ class Guest(XMLBuilder): +@@ -361,6 +362,17 @@ class Guest(XMLBuilder): self._set_osxml_defaults() @@ -30,7 +30,7 @@ self.bootloader = None if (not install and self.os.is_xenpv() and -@@ -372,7 +384,10 @@ class Guest(XMLBuilder): +@@ -379,7 +391,10 @@ class Guest(XMLBuilder): self.bootloader = "/usr/bin/pygrub" self.os.clear() @@ -41,4 +41,4 @@ + return xml_config - ############## + ########################### ++++++ virtinst-set-qemu-emulator.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,19 +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.2.1/virtinst/guest.py +Index: virt-manager-1.3.0/virtinst/guest.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/guest.py -+++ virt-manager-1.2.1/virtinst/guest.py -@@ -19,6 +19,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301 USA. - -+import os - import logging - - import urlgrabber.progress as progress -@@ -810,14 +811,29 @@ class Guest(XMLBuilder): +--- virt-manager-1.3.0.orig/virtinst/guest.py ++++ virt-manager-1.3.0/virtinst/guest.py +@@ -849,14 +849,29 @@ class Guest(XMLBuilder): self.emulator = None return ++++++ virtinst-storage-ocfs2.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement to add ocfs2 as a supported FS type -Index: virt-manager-1.2.1/virtinst/storage.py +Index: virt-manager-1.3.0/virtinst/storage.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/storage.py -+++ virt-manager-1.2.1/virtinst/storage.py -@@ -449,7 +449,7 @@ class StoragePool(_StorageObject): +--- virt-manager-1.3.0.orig/virtinst/storage.py ++++ virt-manager-1.3.0/virtinst/storage.py +@@ -448,7 +448,7 @@ class StoragePool(_StorageObject): def list_formats(self): if self.type == self.TYPE_FS: return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", ++++++ virtinst-vol-default-nocow.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -4,11 +4,11 @@ Signed-off-by: Chunyan Liu <cy...@suse.com> -Index: virt-manager-1.2.1/virtinst/storage.py +Index: virt-manager-1.3.0/virtinst/storage.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/storage.py -+++ virt-manager-1.2.1/virtinst/storage.py -@@ -718,6 +718,11 @@ class StorageVolume(_StorageObject): +--- virt-manager-1.3.0.orig/virtinst/storage.py ++++ virt-manager-1.3.0/virtinst/storage.py +@@ -716,6 +716,11 @@ class StorageVolume(_StorageObject): lazy_refcounts = XMLProperty("./target/features/lazy_refcounts", is_bool=True, default_cb=_lazy_refcounts_default_cb) ++++++ virtinst-xen-drive-type.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -2,27 +2,14 @@ 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.1.0/virtinst/devicedisk.py +Index: virt-manager-1.3.0/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.1.0.orig/virtinst/devicedisk.py -+++ virt-manager-1.1.0/virtinst/devicedisk.py -@@ -572,6 +572,12 @@ class VirtualDisk(VirtualDevice): - return None - if self.conn.is_qemu(): - return self.DRIVER_QEMU -+ else: -+ drvtypes = ['qcow2', 'vmdk'] -+ if self.type in drvtypes: -+ return 'tap' -+ else: -+ return self.DRIVER_QEMU - return None - - def _get_default_driver_type(self): -@@ -585,6 +591,8 @@ class VirtualDisk(VirtualDevice): +--- virt-manager-1.3.0.orig/virtinst/devicedisk.py ++++ virt-manager-1.3.0/virtinst/devicedisk.py +@@ -557,6 +557,8 @@ class VirtualDisk(VirtualDevice): http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html """ - if self.driver_name != self.DRIVER_QEMU: + if self.driver_name != self.DRIVER_NAME_QEMU: + if self.driver_name and self.type != 'file': + return self.type return None ++++++ virtinst-xenbus-disk-index-fix.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtinst/devicedisk.py +Index: virt-manager-1.3.0/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/devicedisk.py -+++ virt-manager-1.2.1/virtinst/devicedisk.py -@@ -1015,6 +1015,17 @@ class VirtualDisk(VirtualDevice): +--- virt-manager-1.3.0.orig/virtinst/devicedisk.py ++++ virt-manager-1.3.0/virtinst/devicedisk.py +@@ -976,6 +976,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() -@@ -1028,7 +1039,12 @@ class VirtualDisk(VirtualDevice): +@@ -989,7 +1000,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.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,10 +1,10 @@ Enhancement for when no hypervisor can be found locally it opens the new connection dialog. -Index: virt-manager-1.2.1/virtManager/engine.py +Index: virt-manager-1.3.0/virtManager/engine.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/engine.py -+++ virt-manager-1.2.1/virtManager/engine.py -@@ -199,9 +199,6 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.0.orig/virtManager/engine.py ++++ virt-manager-1.3.0/virtManager/engine.py +@@ -207,9 +207,6 @@ class vmmEngine(vmmGObject): except: logging.exception("Error talking to PackageKit") @@ -14,7 +14,7 @@ warnmsg = _("The 'libvirtd' service will need to be started.\n\n" "After that, virt-manager will connect to libvirt on\n" "the next application start up.") -@@ -215,7 +212,11 @@ class vmmEngine(vmmGObject): +@@ -223,7 +220,11 @@ class vmmEngine(vmmGObject): if not connected and do_start: manager.err.ok(_("Libvirt service must be started"), warnmsg) ++++++ virtman-allow-creating-i686-vm.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,13 +1,13 @@ 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.2.1/virtManager/create.py +Index: virt-manager-1.3.0/virtManager/create.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/create.py -+++ virt-manager-1.2.1/virtManager/create.py -@@ -689,11 +689,6 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/create.py ++++ virt-manager-1.3.0/virtManager/create.py +@@ -775,11 +775,6 @@ class vmmCreate(vmmGObjectUI): for guest in self.conn.caps.guests: - if guest.os_type == self.capsinfo.os_type: + if guest.os_type == self._capsinfo.os_type: archs.append(guest.arch) - - # Combine x86/i686 to avoid confusion ++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtManager/manager.py +Index: virt-manager-1.3.0/virtManager/manager.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/manager.py -+++ virt-manager-1.2.1/virtManager/manager.py -@@ -859,7 +859,7 @@ class vmmManager(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/manager.py ++++ virt-manager-1.3.0/virtManager/manager.py +@@ -857,7 +857,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.2.1/virtManager/vmmenu.py +Index: virt-manager-1.3.0/virtManager/vmmenu.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/vmmenu.py -+++ virt-manager-1.2.1/virtManager/vmmenu.py +--- virt-manager-1.3.0.orig/virtManager/vmmenu.py ++++ virt-manager-1.3.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.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,10 +1,10 @@ References: bnc#907958 Sanity check for those who forget '-X' on ssh and try to start virt-manager -Index: virt-manager-1.2.1/virt-manager +Index: virt-manager-1.3.0/virt-manager =================================================================== ---- virt-manager-1.2.1.orig/virt-manager -+++ virt-manager-1.2.1/virt-manager -@@ -182,8 +182,11 @@ def main(): +--- 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:] ++++++ virtman-default-guest-from-host-os.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtManager/create.py +Index: virt-manager-1.3.0/virtManager/create.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/create.py -+++ virt-manager-1.2.1/virtManager/create.py +--- virt-manager-1.3.0.orig/virtManager/create.py ++++ virt-manager-1.3.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 -@@ -843,7 +845,7 @@ class vmmCreate(vmmGObjectUI): +@@ -963,7 +965,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,9 +22,9 @@ for v in variants: supported = v in supportl or v.name == "generic" -@@ -1174,6 +1176,53 @@ class vmmCreate(vmmGObjectUI): - return - self.start_detection(forward=forward) +@@ -1320,6 +1322,53 @@ class vmmCreate(vmmGObjectUI): + def _cdrom_changed(self, src): + self._detectable_media_widget_changed(src) + def _lookup_host_os(self): + if sys.platform == 'linux2': @@ -73,13 +73,13 @@ + break + index += 1 + - def toggle_detect_os(self, src): + def _toggle_detect_os(self, src): dodetect = src.get_active() -@@ -1186,6 +1235,8 @@ class vmmCreate(vmmGObjectUI): +@@ -1332,6 +1381,8 @@ class vmmCreate(vmmGObjectUI): self.widget("install-os-version-entry").set_text("") - self.mediaDetected = False - self.detect_media_os() + self._os_already_detected_for_media = False + self._start_detect_os_if_needed() + else: + self.detect_host_os() ++++++ virtman-default-to-xen-pv.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement to default to PV instead of HVM on Xen host. -Index: virt-manager-1.2.1/virtManager/create.py +Index: virt-manager-1.3.0/virtManager/create.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/create.py -+++ virt-manager-1.2.1/virtManager/create.py -@@ -878,7 +878,12 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/create.py ++++ virt-manager-1.3.0/virtManager/create.py +@@ -685,7 +685,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-desktop.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,7 +1,7 @@ -Index: virt-manager-1.1.0/data/virt-manager.desktop.in +Index: virt-manager-1.3.0/data/virt-manager.desktop.in =================================================================== ---- virt-manager-1.1.0.orig/data/virt-manager.desktop.in -+++ virt-manager-1.1.0/data/virt-manager.desktop.in +--- virt-manager-1.3.0.orig/data/virt-manager.desktop.in ++++ virt-manager-1.3.0/data/virt-manager.desktop.in @@ -1,8 +1,19 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-dont-allow-grub.xen-to-be-deleted.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtManager/delete.py +Index: virt-manager-1.3.0/virtManager/delete.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/delete.py -+++ virt-manager-1.2.1/virtManager/delete.py -@@ -253,7 +253,7 @@ def populate_storage_list(storage_list, +--- 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)) for target, path, ro, shared in diskdata: ++++++ virtman-eepro100.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement to add the eepro100 NIC for KVM -Index: virt-manager-1.2.1/virtManager/addhardware.py +Index: virt-manager-1.3.0/virtManager/addhardware.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/addhardware.py -+++ virt-manager-1.2.1/virtManager/addhardware.py -@@ -571,6 +571,7 @@ class vmmAddHardware(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/addhardware.py ++++ virt-manager-1.3.0/virtManager/addhardware.py +@@ -565,6 +565,7 @@ class vmmAddHardware(vmmGObjectUI): if vm.is_hvm(): mod_list = [] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-increase-setKeepAlive-count.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtManager/connection.py +Index: virt-manager-1.3.0/virtManager/connection.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/connection.py -+++ virt-manager-1.2.1/virtManager/connection.py -@@ -906,7 +906,7 @@ class vmmConnection(vmmGObject): +--- virt-manager-1.3.0.orig/virtManager/connection.py ++++ virt-manager-1.3.0/virtManager/connection.py +@@ -945,7 +945,7 @@ class vmmConnection(vmmGObject): self.caps.get_cpu_values("x86_64") try: ++++++ virtman-keycombo.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ Enhancement adding Send Keys for mostly NetWare and also Windows -Index: virt-manager-1.1.0/virtManager/console.py +Index: virt-manager-1.3.0/virtManager/console.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/console.py -+++ virt-manager-1.1.0/virtManager/console.py -@@ -140,6 +140,16 @@ class vmmConsolePages(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/console.py ++++ virt-manager-1.3.0/virtManager/console.py +@@ -141,6 +141,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-kvm.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,9 +1,9 @@ /usr/bin/kvm doesn't exist on suse distros so check instead for /usr/bin/qemu-system-x86_64 -Index: virt-manager-1.1.0/virtManager/connect.py +Index: virt-manager-1.3.0/virtManager/connect.py =================================================================== ---- virt-manager-1.1.0.orig/virtManager/connect.py -+++ virt-manager-1.1.0/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): if (os.path.exists("/usr/bin/qemu") or ++++++ virtman-libvirtd-not-running.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,8 +1,8 @@ Use the correct systemd to start libvirt. -Index: virt-manager-1.2.0/virtManager/packageutils.py +Index: virt-manager-1.3.0/virtManager/packageutils.py =================================================================== ---- virt-manager-1.2.0.orig/virtManager/packageutils.py -+++ virt-manager-1.2.0/virtManager/packageutils.py +--- virt-manager-1.3.0.orig/virtManager/packageutils.py ++++ virt-manager-1.3.0/virtManager/packageutils.py @@ -154,8 +154,8 @@ def start_libvirtd(): logging.debug("libvirtd not running, asking system-config-services " "to start it") ++++++ virtman-load-stored-uris.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -1,15 +1,10 @@ -Reference: bnc#867749 -When booted into the native kernel don't ask libvirt to make a -local Xen connection and likewise when booted into the Xen kernel -don't ask libvirt to connect to the local qemu. -Index: virt-manager-1.2.1/virtManager/engine.py -=================================================================== ---- virt-manager-1.2.1.orig/virtManager/engine.py -+++ virt-manager-1.2.1/virtManager/engine.py -@@ -223,9 +223,22 @@ class vmmEngine(vmmGObject): - if not uris: - return - logging.debug("About to connect to uris %s", uris) +diff -rup a/virtManager/engine.py b/virtManager/engine.py +--- a/virtManager/engine.py 2015-12-07 01:23:13.000000000 +0100 ++++ b/virtManager/engine.py 2015-12-13 15:39:06.911652459 +0100 +@@ -260,9 +260,22 @@ class vmmEngine(vmmGObject): + + def load_stored_uris(self): + uris = self.config.get_conn_uris() or [] + tryuri = vmmConnect.default_uri() + found_uri = None for uri in uris: ++++++ virtman-packages.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/setup.py +Index: virt-manager-1.3.0/setup.py =================================================================== ---- virt-manager-1.2.1.orig/setup.py -+++ virt-manager-1.2.1/setup.py -@@ -280,8 +280,11 @@ class configure(Command): +--- virt-manager-1.3.0.orig/setup.py ++++ virt-manager-1.3.0/setup.py +@@ -299,8 +299,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 " -@@ -307,7 +310,8 @@ class configure(Command): +@@ -326,7 +329,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 -@@ -322,8 +326,10 @@ class configure(Command): +@@ -341,8 +345,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,11 +45,11 @@ 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.2.1/virtcli/cliconfig.py +Index: virt-manager-1.3.0/virtcli/cliconfig.py =================================================================== ---- virt-manager-1.2.1.orig/virtcli/cliconfig.py -+++ virt-manager-1.2.1/virtcli/cliconfig.py -@@ -84,7 +84,8 @@ class _CLIConfig(object): +--- virt-manager-1.3.0.orig/virtcli/cliconfig.py ++++ virt-manager-1.3.0/virtcli/cliconfig.py +@@ -83,7 +83,8 @@ class _CLIConfig(object): _get_param("preferred_distros", "")) self.hv_packages = _split_list(_get_param("hv_packages", "")) self.askpass_package = _split_list(_get_param("askpass_packages", "")) @@ -59,11 +59,11 @@ self.default_graphics = _get_param("default_graphics", "spice") self.default_hvs = _split_list(_get_param("default_hvs", "")) -Index: virt-manager-1.2.1/virtManager/config.py +Index: virt-manager-1.3.0/virtManager/config.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/config.py -+++ virt-manager-1.2.1/virtManager/config.py -@@ -165,7 +165,8 @@ class vmmConfig(object): +--- virt-manager-1.3.0.orig/virtManager/config.py ++++ virt-manager-1.3.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 self.hv_packages = CLIConfig.hv_packages @@ -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.2.1/virtManager/engine.py +Index: virt-manager-1.3.0/virtManager/engine.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/engine.py -+++ virt-manager-1.2.1/virtManager/engine.py -@@ -189,21 +189,18 @@ class vmmEngine(vmmGObject): +--- virt-manager-1.3.0.orig/virtManager/engine.py ++++ virt-manager-1.3.0/virtManager/engine.py +@@ -197,21 +197,18 @@ class vmmEngine(vmmGObject): ret = None try: ++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -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.2.1/virtManager/details.py +Index: virt-manager-1.3.0/virtManager/details.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/details.py -+++ virt-manager-1.2.1/virtManager/details.py -@@ -1465,6 +1465,9 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/details.py ++++ virt-manager-1.3.0/virtManager/details.py +@@ -1414,6 +1414,9 @@ class vmmDetails(vmmGObjectUI): self.widget("details-menu-usb-redirection").set_sensitive(can_usb) def control_vm_run(self, src_ignore): ++++++ virtman-show-suse-install-repos.patch ++++++ --- /var/tmp/diff_new_pack.sbli1l/_old 2016-01-08 15:23:25.000000000 +0100 +++ /var/tmp/diff_new_pack.sbli1l/_new 2016-01-08 15:23:25.000000000 +0100 @@ -2,48 +2,46 @@ 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.2.1/virtManager/create.py +Index: virt-manager-1.3.0/virtManager/create.py =================================================================== ---- virt-manager-1.2.1.orig/virtManager/create.py -+++ virt-manager-1.2.1/virtManager/create.py -@@ -359,7 +359,13 @@ class vmmCreate(vmmGObjectUI): +--- virt-manager-1.3.0.orig/virtManager/create.py ++++ virt-manager-1.3.0/virtManager/create.py +@@ -398,7 +398,13 @@ class vmmCreate(vmmGObjectUI): + self.widget("install-url-entry").set_text("") self.widget("install-url-options").set_expanded(False) - urlmodel = self.widget("install-url-box").get_model() - ksmodel = self.widget("install-ks-box").get_model() -- self.populate_media_model(urlmodel, self.config.get_media_urls()) + urlmodel = self.widget("install-url-combo").get_model() +- _populate_media_model(urlmodel, self.config.get_media_urls()) + urllist = self.config.get_media_urls() + (index, inst_repos) = util.getInstallRepos() + for u in urllist: + if u in inst_repos: + inst_repos.remove(u) + media_urllist = urllist + inst_repos -+ self.populate_media_model(urlmodel, media_urllist) - self.populate_media_model(ksmodel, self.config.get_kickstart_urls()) - self.set_distro_labels("-", "-", force=True) ++ _populate_media_model(urlmodel, media_urllist) + self._set_distro_labels("-", "-") -Index: virt-manager-1.2.1/virtinst/util.py + # Install import +Index: virt-manager-1.3.0/virtinst/util.py =================================================================== ---- virt-manager-1.2.1.orig/virtinst/util.py -+++ virt-manager-1.2.1/virtinst/util.py -@@ -23,11 +23,14 @@ import os - import random +--- virt-manager-1.3.0.orig/virtinst/util.py ++++ virt-manager-1.3.0/virtinst/util.py +@@ -24,9 +24,12 @@ import random import re import stat + import sys +import subprocess +from subprocess import Popen, PIPE import libvirt - - _host_blktap_capable = None +_host_repo_url = None - def listify(l): -@@ -462,3 +465,99 @@ def register_libvirt_error_handler(): - ignore = userdata - ignore = err - libvirt.registerErrorHandler(f=libvirt_callback, ctx=None) + if l is None: +@@ -452,3 +455,100 @@ def make_meter(quiet): + if quiet: + return progress.BaseMeter() + return progress.TextMeter(fo=sys.stdout) + +def getHostInstallSource(): + global _host_repo_url @@ -140,3 +138,4 @@ + zypper_output.insert(0, dom0_inst_source) + return (index_dom0, zypper_output) + ++
