From 4f703846c782c924c46d4facd08156334d179175 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Wed, 20 Sep 2017 14:28:03 +0000
Subject: [PATCH] =?UTF-8?q?-=20Update=20to=20virt-manager=201.4.3=20(bsc#1?=
 =?UTF-8?q?027942)=20=20=20virt-manager-1.4.3.tar.bz2=20=20=20*=20Improve?=
 =?UTF-8?q?=20install=20of=20debian/ubuntu=20non-x86=20media=20(Viktor=20M?=
 =?UTF-8?q?ihajlovski,=20Andrew=20Wong)=20=20=20*=20New=20virt-install=20?=
 =?UTF-8?q?=E2=80=93graphics=20listen.*=20(Pavel=20Hrdina)=20=20=20*=20New?=
 =?UTF-8?q?=20virt-install=20=E2=80=93disk=20snapshot=5Fpolicy=3D=20(Pavel?=
 =?UTF-8?q?=20Hrdina)=20=20=20*=20New=20virt-install=20=E2=80=93cpu=20cach?=
 =?UTF-8?q?e.*=20(Lin=20Ma)=20=20=20*=20Several=20bug=20fixes=20-=20Droppe?=
 =?UTF-8?q?d=20the=20following=20patch=20contained=20in=20new=20tarball=20?=
 =?UTF-8?q?=20=20e902fa55-force-binary-mode-with-FTP-servers.patch=20=20?=
 =?UTF-8?q?=20virt-manager-1.4.2.tar.bz2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=369
---
 ...5-force-binary-mode-with-FTP-servers.patch | 19 -------------------
 virt-manager-1.4.2.tar.bz2                    |  3 ---
 virt-manager-1.4.3.tar.bz2                    |  3 +++
 virt-manager.changes                          | 15 ++++++++++++++-
 virt-manager.spec                             |  6 ++----
 virtinst-keep-install-iso-attached.patch      |  8 ++++----
 virtinst-no-usb-tablet-for-xenpv.patch        |  8 +++++---
 virtinst-pvgrub2-bootloader.patch             | 14 +++++++-------
 virtinst-s390x-disable-graphics.patch         | 16 ++++++++--------
 ...st-set-cache-mode-unsafe-for-install.patch | 10 +++++-----
 virtinst-set-qemu-emulator.patch              |  8 ++++----
 virtinst-xenbus-disk-index-fix.patch          | 10 +++++-----
 virtman-increase-setKeepAlive-count.patch     |  8 ++++----
 ...event-double-click-starting-vm-twice.patch |  8 ++++----
 14 files changed, 65 insertions(+), 71 deletions(-)
 delete mode 100644 e902fa55-force-binary-mode-with-FTP-servers.patch
 delete mode 100644 virt-manager-1.4.2.tar.bz2
 create mode 100644 virt-manager-1.4.3.tar.bz2

diff --git a/e902fa55-force-binary-mode-with-FTP-servers.patch b/e902fa55-force-binary-mode-with-FTP-servers.patch
deleted file mode 100644
index 2240d19a..00000000
--- a/e902fa55-force-binary-mode-with-FTP-servers.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: urlfetcher: force binary mode with FTP servers (bz #1462838)
-From: Cole Robinson crobinso@redhat.com Thu Aug 17 16:10:46 2017 -0400
-Date: Thu Aug 17 16:10:46 2017 -0400:
-Git: e902fa5550cc09538429b0fa828fb31aa2706d01
-
-
-diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
-index d04c78f..c60c77d 100644
---- a/virtinst/urlfetcher.py
-+++ b/virtinst/urlfetcher.py
-@@ -224,6 +224,8 @@ class _FTPURLFetcher(_URLFetcher):
-             self._ftp = ftplib.FTP()
-             self._ftp.connect(parsed.hostname, parsed.port)
-             self._ftp.login()
-+            # Force binary mode
-+            self._ftp.voidcmd("TYPE I")
-         except Exception as e:
-             raise ValueError(_("Opening URL %s failed: %s.") %
-                               (self.location, str(e)))
diff --git a/virt-manager-1.4.2.tar.bz2 b/virt-manager-1.4.2.tar.bz2
deleted file mode 100644
index 715cb31f..00000000
--- a/virt-manager-1.4.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d68653224ed21f71247c6f3bc36b4bf2e6f3f37a1039097e69ffc8f4b22eff90
-size 1522298
diff --git a/virt-manager-1.4.3.tar.bz2 b/virt-manager-1.4.3.tar.bz2
new file mode 100644
index 00000000..5b2a8953
--- /dev/null
+++ b/virt-manager-1.4.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a393ece4e4db5dd4e9cfb88102e41200c41b56b1db431b19121f894fd8c9fa0
+size 1516794
diff --git a/virt-manager.changes b/virt-manager.changes
index 9f44ef42..bcd55c6b 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Sep 20 08:21:01 MDT 2017 - carnold@suse.com
+
+- 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 - carnold@suse.com
 
@@ -41,7 +54,7 @@ Tue Aug 22 08:05:07 MDT 2017 - carnold@suse.com
 Wed Aug  9 08:27:42 MDT 2017 - carnold@suse.com
 
 - Update to virt-manager 1.4.2 (bsc#1027942)
-  virt-manager-1.4.1.tar.bz2
+  virt-manager-1.4.2.tar.bz2
   virtinst-check-date-format.patch
   virtinst-no-usb-tablet-for-xenpv.patch
   * New VM wixard virt-bootstrap integration (Radostin Stoyanov)
diff --git a/virt-manager.spec b/virt-manager.spec
index d82cadce..f2016d16 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -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 @@ Source1:        virt-install.rb
 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 @@ machine).
 %prep
 %setup -q
 # Upstream Patches
-%patch1 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1
diff --git a/virtinst-keep-install-iso-attached.patch b/virtinst-keep-install-iso-attached.patch
index 52e57bbc..d421c25a 100644
--- a/virtinst-keep-install-iso-attached.patch
+++ b/virtinst-keep-install-iso-attached.patch
@@ -2,11 +2,11 @@ Older SLE guests have a two stage installation that need the ISO.
 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
diff --git a/virtinst-no-usb-tablet-for-xenpv.patch b/virtinst-no-usb-tablet-for-xenpv.patch
index b9125c11..605a1651 100644
--- a/virtinst-no-usb-tablet-for-xenpv.patch
+++ b/virtinst-no-usb-tablet-for-xenpv.patch
@@ -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
diff --git a/virtinst-pvgrub2-bootloader.patch b/virtinst-pvgrub2-bootloader.patch
index d03ef79c..5f044187 100644
--- a/virtinst-pvgrub2-bootloader.patch
+++ b/virtinst-pvgrub2-bootloader.patch
@@ -2,11 +2,11 @@ Reference: bnc#863821
 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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
  
          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
diff --git a/virtinst-s390x-disable-graphics.patch b/virtinst-s390x-disable-graphics.patch
index 39c715cb..66c598f0 100644
--- a/virtinst-s390x-disable-graphics.patch
+++ b/virtinst-s390x-disable-graphics.patch
@@ -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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
          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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
              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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
  
      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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
              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
  
diff --git a/virtinst-set-cache-mode-unsafe-for-install.patch b/virtinst-set-cache-mode-unsafe-for-install.patch
index ff35d49d..3ae63a1e 100644
--- a/virtinst-set-cache-mode-unsafe-for-install.patch
+++ b/virtinst-set-cache-mode-unsafe-for-install.patch
@@ -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 @@ Index: virt-manager-1.4.2/virtinst/guest.py
          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")
  
diff --git a/virtinst-set-qemu-emulator.patch b/virtinst-set-qemu-emulator.patch
index 6b8d4ece..8556574e 100644
--- a/virtinst-set-qemu-emulator.patch
+++ b/virtinst-set-qemu-emulator.patch
@@ -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
  
diff --git a/virtinst-xenbus-disk-index-fix.patch b/virtinst-xenbus-disk-index-fix.patch
index 8f3800eb..f973e125 100644
--- a/virtinst-xenbus-disk-index-fix.patch
+++ b/virtinst-xenbus-disk-index-fix.patch
@@ -6,11 +6,11 @@ types (ide vs xen) it added xvda with hda.  These disks were then
 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 @@ Index: virt-manager-1.4.2/virtinst/devicedisk.py
          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:
diff --git a/virtman-increase-setKeepAlive-count.patch b/virtman-increase-setKeepAlive-count.patch
index 22c79f87..b2de14e7 100644
--- a/virtman-increase-setKeepAlive-count.patch
+++ b/virtman-increase-setKeepAlive-count.patch
@@ -2,11 +2,11 @@ References: bnc#892003
 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:
diff --git a/virtman-prevent-double-click-starting-vm-twice.patch b/virtman-prevent-double-click-starting-vm-twice.patch
index d0ceba10..b8f6ae08 100644
--- a/virtman-prevent-double-click-starting-vm-twice.patch
+++ b/virtman-prevent-double-click-starting-vm-twice.patch
@@ -3,11 +3,11 @@ When the 'Power on virtual machine' button is double clicked,
 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