Accepting request 711380 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/711380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=196

578451fe-urldetect-Dont-run-regex-against-None-SUSE-product-name.patch

@@ -0,0 +1,24 @@
+Subject: urldetect: Don't run regex against None SUSE product name
+From: Cole Robinson crobinso@redhat.com Mon Jun 10 08:42:39 2019 -0400
+Date: Mon Jun 10 08:44:20 2019 -0400:
+Git: 578451fe721f8df0cf81c7d510a51af8fbe8179d
+
+We are implicitly depending on random dict ordering for what
+order we process Distro matching. Our test suite mocking and
+different debian ordering revealed a case we could be trying to
+run a regex against None. Fix it. The dict ordering issue will
+be fixed separately
+
+Index: virt-manager-2.1.0/virtinst/urldetect.py
+===================================================================
+--- virt-manager-2.1.0.orig/virtinst/urldetect.py
++++ virt-manager-2.1.0/virtinst/urldetect.py
+@@ -499,7 +499,7 @@ class _SuseDistro(_RHELDistro):
+         if not cache.suse_content:
+             return False
+         for regex in cls._suse_regex:
+-            if re.match(regex, cache.suse_content.product_name):
++            if re.match(regex, cache.suse_content.product_name or ""):
+                 return True
+         return False
+ 

virt-manager.changes

@@ -1,8 +1,17 @@
+-------------------------------------------------------------------
+Thu Jun 13 14:15:44 MDT 2019 - carnold@suse.com
+
+- bsc#1138110 - XEN guest can not be restored from virt-manager
+  after it is saved
+  virtman-fix-restore-vm-menu-selection.patch
+- Upstream bug fix (bsc#1027942)
+  578451fe-urldetect-Dont-run-regex-against-None-SUSE-product-name.patch
+
 -------------------------------------------------------------------
 Mon Jun  3 16:03:39 MDT 2019 - carnold@suse.com
 
 - Make sure the old qemu-dm is not used for installing VMs. It
-  can't handle directl kernel boot. (bsc#1125725)
+  can't handle direct kernel boot. (bsc#1125725)
   virtinst-set-qemu-emulator.patch
 
 -------------------------------------------------------------------

virt-manager.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -62,6 +62,7 @@ Patch26:        f23b01be-guest-Add-VirtIO-input-devices-to-s390x-guests-with-gra
 Patch27:        7afbb90b-virt-xml-Handle-VM-names-that-look-like-id-uuid.patch
 Patch28:        8d9743d6-virt-install-Add-support-for-xenbus-controller.patch
 Patch29:        a0ca387a-cli-Fix-pool-default-when-path-belongs-to-another-pool.patch
+Patch30:        578451fe-urldetect-Dont-run-regex-against-None-SUSE-product-name.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -93,6 +94,7 @@ Patch152:       virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch
 Patch153:       virtman-check-for-valid-display.patch
 Patch154:       virtman-allow-creating-i686-vm.patch
 Patch155:       virtman-dont-specify-vte-version.patch
+Patch156:       virtman-fix-restore-vm-menu-selection.patch
 Patch160:       virtinst-xen-drive-type.patch
 Patch161:       virtinst-xenbus-disk-index-fix.patch
 Patch162:       virtinst-refresh_before_fetch_pool.patch
@@ -217,6 +219,7 @@ machine).
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1
@@ -248,6 +251,7 @@ machine).
 %patch153 -p1
 %patch154 -p1
 %patch155 -p1
+%patch156 -p1
 %patch160 -p1
 %patch161 -p1
 %patch162 -p1

virtman-fix-restore-vm-menu-selection.patch

@@ -0,0 +1,17 @@
+References: bsc#1138110
+virt-manager no longer tracks the saved state but leaves it up to libvirt.
+Libvirt returns libvirt.VIR_DOMAIN_PMSUSPENDED after a vm has been 'saved'.
+
+
+--- virt-manager-2.1.0/virtManager/domain.py.orig	2019-06-13 13:53:44.915571869 -0600
++++ virt-manager-2.1.0/virtManager/domain.py	2019-06-13 14:11:40.413147729 -0600
+@@ -1599,7 +1599,8 @@ class vmmDomain(vmmLibvirtObject):
+         return (self.is_stoppable() or
+                 self.status() in [libvirt.VIR_DOMAIN_CRASHED])
+     def is_runable(self):
+-        return self.is_shutoff()
++        return self.status() in [libvirt.VIR_DOMAIN_SHUTOFF,
++                                 libvirt.VIR_DOMAIN_PMSUSPENDED]
+     def is_pauseable(self):
+         return self.status() in [libvirt.VIR_DOMAIN_RUNNING]
+     def is_unpauseable(self):