Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2017-09-21 12:35:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Thu Sep 21 12:35:31 2017 rev:156 rq:527611 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2017-09-15 22:31:18.855440695 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2017-09-21 12:36:41.835627052 +0200 @@ -1,0 +2,19 @@ +Wed Sep 20 08:21:01 MDT 2017 - [email protected] + +- Update to virt-manager 1.4.3 (bsc#1027942) + virt-manager-1.4.3.tar.bz2 + * Improve install of debian/ubuntu non-x86 media (Viktor Mihajlovski, Andrew Wong) + * New virt-install –graphics listen.* (Pavel Hrdina) + * New virt-install –disk snapshot_policy= (Pavel Hrdina) + * New virt-install –cpu cache.* (Lin Ma) + * Several bug fixes +- Dropped the following patch contained in new tarball + e902fa55-force-binary-mode-with-FTP-servers.patch + +------------------------------------------------------------------- +Fri Sep 15 15:13:42 MDT 2017 - [email protected] + +- Add .treeinfo detection for SUSE distros (bsc#1054986) + virtinst-add-sle15-detection-support.patch + +------------------------------------------------------------------- @@ -38 +57 @@ - virt-manager-1.4.1.tar.bz2 + virt-manager-1.4.2.tar.bz2 Old: ---- e902fa55-force-binary-mode-with-FTP-servers.patch virt-manager-1.4.2.tar.bz2 New: ---- virt-manager-1.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:49.726516637 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:49.730516074 +0200 @@ -23,11 +23,11 @@ %define libvirt_xen_packages "" %define preferred_distros "sles12sp3,opensuse42.3" %define kvm_packages "" -%define _version 1.4.2 +%define _version 1.4.3 %define _release 0 Name: virt-manager -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Virtual Machine Manager License: GPL-2.0+ @@ -38,7 +38,6 @@ Source2: virt-install.desktop Source3: virt-manager-supportconfig # Upstream Patches -Patch1: e902fa55-force-binary-mode-with-FTP-servers.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -163,7 +162,6 @@ %prep %setup -q # Upstream Patches -%patch1 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 ++++++ virt-manager-1.4.2.tar.bz2 -> virt-manager-1.4.3.tar.bz2 ++++++ ++++ 89056 lines of diff (skipped) ++++++ virtinst-add-caasp-support.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.758230732 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.758230732 +0200 @@ -24,13 +24,15 @@ else: self.os_variant += "9" -@@ -1090,6 +1096,9 @@ class SuseDistro(Distro): - return osobj.name - return self.os_variant +@@ -1098,6 +1104,11 @@ class SLESDistro(SuseDistro): + class SLEDDistro(SuseDistro): + urldistro = "sled" ++ +class CAASPDistro(SuseDistro): + urldistro = "caasp" + ++ + class OESDistro(SuseDistro): + urldistro = "oes" - class SLESDistro(SuseDistro): - urldistro = "sles" ++++++ virtinst-add-sle15-detection-support.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.770229044 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.774228481 +0200 @@ -1,17 +1,16 @@ References: bsc#1054986 With SLE15 and openSUSE 15 the content file has been removed from the media. This file was used for SUSE distro version and arch detection. Now detection -must be done by parsing the media.1/products file for distro version and the -media.1/build file for the arch. The media.1/products and media.1/build files -have always been around so the entire _distroFromSUSEContent could be rewritten -(and simplified) to only check them. The products file format did change -between 11-SP4 and 12. SLE10 has no build file. +must be done by parsing the .treeinfo file. +We must continue to keep the content parsing code for the older distros. +As a fallback, detection is also setup to look at the media.1/products and +media.1/build files. -Index: virt-manager-1.4.2/virtinst/urlfetcher.py +Index: virt-manager-1.4.3/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py -+++ virt-manager-1.4.2/virtinst/urlfetcher.py -@@ -392,7 +392,20 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.4.3.orig/virtinst/urlfetcher.py ++++ virt-manager-1.4.3/virtinst/urlfetcher.py +@@ -392,7 +392,23 @@ def _distroFromSUSEContent(fetcher, arch try: cbuf = fetcher.acquireFileContent("content") except ValueError: @@ -19,21 +18,24 @@ + try: + # If no content file, try media.1/products and media.1/build and create + # a cbuf with enough info for the content file parsing code below to work -+ pbuf = fetcher.acquireFileContent("media.1/products").rsplit('/', 1)[1].strip() -+ # Older style products format: SUSE-Linux-Enterprise-Server-11-SP4 11.4.4-1.109 -+ # Newer style products format: SLES12-SP3 12.3-0 ++ pbuf = fetcher.acquireFileContent("media.1/products").strip() ++ pbuf = pbuf.split(' ', 1)[1].strip() ++ # The media.1/products file naming convention changed between SLE11 and SLE12 + if pbuf.startswith('SLE') or pbuf.startswith('leanos'): + pbuf = pbuf.split(' ')[0] + pbuf = " ".join(re.split('(\d+)', pbuf, 1)) + cbuf = "\nDISTRO ," + pbuf.replace('-', ' ') -+ bbuf = fetcher.acquireFileContent("media.1/build").split('-') ++ try: ++ bbuf = fetcher.acquireFileContent("media.1/build").split('-') ++ except: ++ bbuf = ["x86_64"] + cbuf = cbuf + "\n" + " ".join(bbuf) + except ValueError: + return None distribution = None distro_version = None -@@ -465,7 +478,8 @@ def _distroFromSUSEContent(fetcher, arch +@@ -465,7 +481,8 @@ def _distroFromSUSEContent(fetcher, arch dclass = GenericDistro if distribution: if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \ @@ -43,7 +45,7 @@ dclass = SLESDistro if distro_version is None: distro_version = _parse_sle_distribution(distribution) -@@ -481,7 +495,7 @@ def _distroFromSUSEContent(fetcher, arch +@@ -481,7 +498,7 @@ def _distroFromSUSEContent(fetcher, arch dclass = CAASPDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]] @@ -52,7 +54,15 @@ dclass = OpensuseDistro if distro_version is None: distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]] -@@ -1040,8 +1054,11 @@ class SuseDistro(Distro): +@@ -1003,6 +1020,7 @@ class SLDistro(RHELDistro): + + class SuseDistro(Distro): + name = "SUSE" ++ uses_treeinfo = True + + _boot_iso_paths = ["boot/boot.iso"] + +@@ -1040,8 +1058,11 @@ class SuseDistro(Distro): self._xen_kernel_paths = [("boot/%s/vmlinuz-xenpae" % self.arch, "boot/%s/initrd-xenpae" % self.arch)] else: @@ -66,3 +76,46 @@ def _variantFromVersion(self): distro_version = self.version_from_content[1].strip() +@@ -1053,7 +1074,7 @@ class SuseDistro(Distro): + if len(distro_version.split('.', 1)) == 2: + sp_version = 'sp' + distro_version.split('.', 1)[1].strip() + self.os_variant += version +- if sp_version: ++ if sp_version and sp_version != 'sp0': + self.os_variant += sp_version + elif self.os_variant.startswith("opensuse"): + if len(version) == 8: +@@ -1077,6 +1098,24 @@ class SuseDistro(Distro): + self.os_variant += "9" + + def isValidStore(self): ++ if self.treeinfo: ++ ret = False ++ if self.urldistro: ++ family = self.treeinfo.get("general", "family") ++ if "SUSE Linux Enterprise Server" in family and 'sles' in self.urldistro or \ ++ "SUSE Linux Enterprise Desktop" in family and 'sled' in self.urldistro or \ ++ "SUSE Linux Enterprise" in family and 'sles' in self.urldistro or \ ++ "SUSE Containers" in family and 'caasp' in self.urldistro or \ ++ "openSUSE" in family and 'opensuse' in self.urldistro or \ ++ "Open Enterprise" in family and 'oes' in self.urldistro: ++ ret = True ++ if ret: ++ version = self.treeinfo.get("general", "version") ++ distro_version = ['VERSION', version] ++ self.version_from_content = distro_version ++ self._variantFromVersion() ++ return ret ++ + # self.version_from_content is the VERSION line from the contents file + if (not self.version_from_content or + self.version_from_content[1] is None): +@@ -1128,8 +1167,6 @@ class OESDistro(SuseDistro): + urldistro = "oes" + + +-# Suse image store is harder - we fetch the kernel RPM and a helper +-# RPM and then munge bits together to generate a initrd + class OpensuseDistro(SuseDistro): + urldistro = "opensuse" + ++++++ virtinst-keep-install-iso-attached.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.794225667 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.794225667 +0200 @@ -2,11 +2,11 @@ Newer SLE PV guests hang when a cdrom device is attached without an ISO file. -Index: virt-manager-1.4.2/virtinst/guest.py +Index: virt-manager-1.4.3/virtinst/guest.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/guest.py -+++ virt-manager-1.4.2/virtinst/guest.py -@@ -804,7 +804,8 @@ class Guest(XMLBuilder): +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -805,7 +805,8 @@ class Guest(XMLBuilder): # install. if (dev.is_cdrom() and getattr(dev, "installer_media", False) and ++++++ virtinst-no-usb-tablet-for-xenpv.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.810223415 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.810223415 +0200 @@ -1,9 +1,11 @@ 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): +Index: virt-manager-1.4.3/virtinst/guest.py +=================================================================== +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -660,7 +660,7 @@ class Guest(XMLBuilder): usb_tablet = False usb_keyboard = False ++++++ virtinst-pvgrub2-bootloader.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.822221727 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.826221164 +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.2/virtinst/guest.py +Index: virt-manager-1.4.3/virtinst/guest.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/guest.py -+++ virt-manager-1.4.2/virtinst/guest.py -@@ -365,8 +365,20 @@ class Guest(XMLBuilder): +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -366,8 +366,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.2/virtinst/installer.py +Index: virt-manager-1.4.3/virtinst/installer.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/installer.py -+++ virt-manager-1.4.2/virtinst/installer.py +--- virt-manager-1.4.3.orig/virtinst/installer.py ++++ virt-manager-1.4.3/virtinst/installer.py @@ -99,7 +99,7 @@ class Installer(object): break return bootorder ++++++ virtinst-s390x-disable-graphics.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.834220039 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.838219476 +0200 @@ -1,10 +1,10 @@ Reference: bnc#869024 Disable graphics on s390x -Index: virt-manager-1.4.2/virtinst/guest.py +Index: virt-manager-1.4.3/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): +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -125,7 +125,10 @@ class Guest(XMLBuilder): self.skip_default_channel = False self.skip_default_sound = False self.skip_default_usbredir = False @@ -16,7 +16,7 @@ self.skip_default_rng = False self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY -@@ -686,7 +689,7 @@ class Guest(XMLBuilder): +@@ -687,7 +690,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 -@@ -741,6 +744,8 @@ class Guest(XMLBuilder): +@@ -742,6 +745,8 @@ class Guest(XMLBuilder): dev.target_type = "virtio" dev.target_name = dev.CHANNEL_NAME_QEMUGA self.add_device(dev) @@ -34,7 +34,7 @@ def add_default_graphics(self): if self.skip_default_graphics: -@@ -749,7 +754,7 @@ class Guest(XMLBuilder): +@@ -750,7 +755,7 @@ class Guest(XMLBuilder): return if self.os.is_container() and not self.conn.is_vz(): return @@ -43,7 +43,7 @@ return self.add_device(VirtualGraphics(self.conn)) -@@ -1084,7 +1089,7 @@ class Guest(XMLBuilder): +@@ -1086,7 +1091,7 @@ class Guest(XMLBuilder): if not os_support: return False ++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.846218351 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.846218351 +0200 @@ -1,10 +1,10 @@ Set cache mode for target installation disk to unsafe for better performance. -Index: virt-manager-1.4.2/virtinst/guest.py +Index: virt-manager-1.4.3/virtinst/guest.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/guest.py -+++ virt-manager-1.4.2/virtinst/guest.py -@@ -361,6 +361,17 @@ class Guest(XMLBuilder): +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -362,6 +362,17 @@ class Guest(XMLBuilder): self._set_osxml_defaults() @@ -22,7 +22,7 @@ self.bootloader = None if (not install and self.os.is_xenpv() and -@@ -380,7 +391,10 @@ class Guest(XMLBuilder): +@@ -381,7 +392,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.23KnFJ/_old 2017-09-21 12:36:51.858216662 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.862216100 +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.2/virtinst/guest.py +Index: virt-manager-1.4.3/virtinst/guest.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/guest.py -+++ virt-manager-1.4.2/virtinst/guest.py -@@ -895,14 +895,11 @@ class Guest(XMLBuilder): +--- virt-manager-1.4.3.orig/virtinst/guest.py ++++ virt-manager-1.4.3/virtinst/guest.py +@@ -897,14 +897,11 @@ class Guest(XMLBuilder): self.emulator = None return ++++++ virtinst-xenbus-disk-index-fix.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.886212722 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.886212722 +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.2/virtinst/devicedisk.py +Index: virt-manager-1.4.3/virtinst/devicedisk.py =================================================================== ---- virt-manager-1.4.2.orig/virtinst/devicedisk.py -+++ virt-manager-1.4.2/virtinst/devicedisk.py -@@ -1003,6 +1003,17 @@ class VirtualDisk(VirtualDevice): +--- virt-manager-1.4.3.orig/virtinst/devicedisk.py ++++ virt-manager-1.4.3/virtinst/devicedisk.py +@@ -1004,6 +1004,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() -@@ -1016,7 +1027,12 @@ class VirtualDisk(VirtualDevice): +@@ -1017,7 +1028,12 @@ class VirtualDisk(VirtualDevice): ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7) for i in ran: ++++++ virtman-increase-setKeepAlive-count.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.926207094 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.926207094 +0200 @@ -2,11 +2,11 @@ For very large memory VMs Xen takes a long time scrubbing memory which causes the libvirt connection to timeout. Upstream was not interested in making this a preferences option (4/11/2015) -Index: virt-manager-1.4.2/virtManager/connection.py +Index: virt-manager-1.4.3/virtManager/connection.py =================================================================== ---- virt-manager-1.4.2.orig/virtManager/connection.py -+++ virt-manager-1.4.2/virtManager/connection.py -@@ -1076,7 +1076,7 @@ class vmmConnection(vmmGObject): +--- virt-manager-1.4.3.orig/virtManager/connection.py ++++ virt-manager-1.4.3/virtManager/connection.py +@@ -1086,7 +1086,7 @@ class vmmConnection(vmmGObject): self.caps.get_cpu_values(self.caps.host.cpu.arch) try: ++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++ --- /var/tmp/diff_new_pack.23KnFJ/_old 2017-09-21 12:36:51.950203717 +0200 +++ /var/tmp/diff_new_pack.23KnFJ/_new 2017-09-21 12:36:51.954203155 +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.2/virtManager/details.py +Index: virt-manager-1.4.3/virtManager/details.py =================================================================== ---- virt-manager-1.4.2.orig/virtManager/details.py -+++ virt-manager-1.4.2/virtManager/details.py -@@ -1451,6 +1451,9 @@ class vmmDetails(vmmGObjectUI): +--- virt-manager-1.4.3.orig/virtManager/details.py ++++ virt-manager-1.4.3/virtManager/details.py +@@ -1449,6 +1449,9 @@ class vmmDetails(vmmGObjectUI): def control_vm_run(self, src_ignore): if self.has_unapplied_changes(self.get_hw_row()): return
