import virt-manager-2.2.1-4.el8

SOURCES/virt-manager-details-Fix-showing-the-firmware-type-in-case-of-firmware-auto-selection.patch

@@ -0,0 +1,49 @@
+From d3d7b75a5926059733871a90c106be8190e166a9 Mon Sep 17 00:00:00 2001
+Message-Id: <d3d7b75a5926059733871a90c106be8190e166a9@dist-git>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Wed, 15 Jan 2020 10:34:12 +0800
+Subject: [PATCH] details: Fix showing the firmware type in case of firmware
+ auto selection
+
+From: Lin Ma <lma@suse.com>
+
+For a shutoff VM, If user select uefi firmware auto selection, e.g.
+<os firmware='efi'>
+...
+</os>
+
+Its firmware information is set to 'BIOS' in details, This is incorrect.
+This fixes it.
+
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+Signed-off-by: Lin Ma <lma@suse.com>
+(cherry picked from commit 15a9502b7b7a263c4d66ff2b3f31c209f58fe0b4)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1857069
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ virtManager/details/details.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/virtManager/details/details.py b/virtManager/details/details.py
+index 51d170e9..7b0a501f 100644
+--- a/virtManager/details/details.py
++++ b/virtManager/details/details.py
+@@ -2017,8 +2017,11 @@ class vmmDetails(vmmGObjectUI):
+ 
+         # Firmware
+         domcaps = self.vm.get_domain_capabilities()
+-        firmware = domcaps.label_for_firmware_path(
+-            self.vm.get_xmlobj().os.loader)
++        if self.vm.get_xmlobj().is_uefi():
++            firmware = 'UEFI'
++        else:
++            firmware = domcaps.label_for_firmware_path(
++                self.vm.get_xmlobj().os.loader)
+         if self.widget("overview-firmware").is_visible():
+             uiutil.set_list_selection(
+                 self.widget("overview-firmware"), firmware)
+-- 
+2.26.2
+

SOURCES/virt-manager-details-fix-detection-of-firmware-auto-selection.patch

@@ -0,0 +1,39 @@
+From 082ac77cee8141494f1185a0debf958694639e4f Mon Sep 17 00:00:00 2001
+Message-Id: <082ac77cee8141494f1185a0debf958694639e4f@dist-git>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 21 Jul 2020 12:33:56 +0200
+Subject: [PATCH] details: fix detection of firmware auto-selection
+
+Commit <15a9502b7b7a263c4d66ff2b3f31c209f58fe0b4> fixed firmware
+detection but incorrectly. It will always show only "UEFI" even if
+the firmware auto-selection is not used because the function is_uefi()
+checks both the old style and the new auto-selection.
+
+We have to check only for the auto-selection option.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit e8bf16b983558010cc9645e09eb36117e9e4fba4)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1857069
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ virtManager/details/details.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virtManager/details/details.py b/virtManager/details/details.py
+index 7b0a501f..4d67d8b1 100644
+--- a/virtManager/details/details.py
++++ b/virtManager/details/details.py
+@@ -2017,7 +2017,7 @@ class vmmDetails(vmmGObjectUI):
+ 
+         # Firmware
+         domcaps = self.vm.get_domain_capabilities()
+-        if self.vm.get_xmlobj().is_uefi():
++        if self.vm.get_xmlobj().os.firmware == "efi":
+             firmware = 'UEFI'
+         else:
+             firmware = domcaps.label_for_firmware_path(
+-- 
+2.26.2
+

SOURCES/virt-manager-domain-Fix-VM-deletion-with-firmare-efi.patch

@@ -0,0 +1,40 @@
+From b17d858ccca69ed09fec0a254e133210fef08e17 Mon Sep 17 00:00:00 2001
+Message-Id: <b17d858ccca69ed09fec0a254e133210fef08e17@dist-git>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 8 Sep 2020 15:15:14 -0400
+Subject: [PATCH] domain: Fix VM deletion with firmare='efi'
+
+From: Cole Robinson <crobinso@redhat.com>
+
+Our check for nvram was not complete for that case
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1869135
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+(cherry picked from commit 38cd19b0c31788cb5e6d16cfa122d52a8c7f630d)
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ virtManager/object/domain.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py
+index f61f0f53..e83f1b11 100644
+--- a/virtManager/object/domain.py
++++ b/virtManager/object/domain.py
+@@ -271,9 +271,10 @@ class vmmDomain(vmmLibvirtObject):
+         return str(i)
+ 
+     def has_nvram(self):
+-        return bool(self.get_xmlobj().os.loader_ro is True and
+-                    self.get_xmlobj().os.loader_type == "pflash" and
+-                    self.get_xmlobj().os.nvram)
++        return bool(self.get_xmlobj().os.firmware == 'efi' or
++                    (self.get_xmlobj().os.loader_ro is True and
++                     self.get_xmlobj().os.loader_type == "pflash" and
++                     self.get_xmlobj().os.nvram))
+ 
+     def is_persistent(self):
+         return bool(self._backend.isPersistent())
+-- 
+2.26.2
+

SOURCES/virt-manager-virt-install-Use-minutes-instead-of-seconds-on-get_time_string.patch

@@ -0,0 +1,47 @@
+From 8676750b73bda178cfe0f278e76547711910f71d Mon Sep 17 00:00:00 2001
+Message-Id: <8676750b73bda178cfe0f278e76547711910f71d@dist-git>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Thu, 25 Jul 2019 14:09:53 +0200
+Subject: [PATCH] virt-install: Use minutes instead of seconds on
+ get_time_string()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Fabiano Fidêncio <fidencio@redhat.com>
+
+get_time_string() currently uses self._wait_secs, while it should use
+self._wait_mins, resulting on confusing messages when using `--wait`
+option, as shown below:
+
+fidencio@laerte ~/src/upstream/virt-manager $ ./virt-install --install fedora30 --unattended --wait 20
+ ...
+Waiting 1200 minutes for installation to complete.
+
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+(cherry picked from commit 414ffa5ef82548d502a4de98d40228a68bdb29c1)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1777664
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ virt-install | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virt-install b/virt-install
+index 009d03e1..022f947d 100755
+--- a/virt-install
++++ b/virt-install
+@@ -614,7 +614,7 @@ class WaitHandler:
+         self._start_time = time.time()
+ 
+     def get_time_string(self):
+-        timestr = _(" %d minutes") % self._wait_secs
++        timestr = _(" %d minutes") % self._wait_mins
+         if self._wait_forever:
+             timestr = ""
+         ret = _("Waiting%(time_string)s for installation to complete.") % {
+-- 
+2.26.2
+

SOURCES/virt-manager-virt-xml-fix-defined_xml_is_unchanged.patch

@@ -0,0 +1,39 @@
+From f018551b9dbf9afc56b44be1af59f29781b6b548 Mon Sep 17 00:00:00 2001
+Message-Id: <f018551b9dbf9afc56b44be1af59f29781b6b548@dist-git>
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 3 Dec 2019 13:02:21 +0100
+Subject: [PATCH] virt-xml: fix defined_xml_is_unchanged
+
+Commit <53f075ab76e1c372474ae0d88f202e487d9f213f> added a warning if the
+VM XML is not changed after removing default devices but the code was
+incorrect.  We have to compare strings instead of string vs Guest object
+and also the condition was inverted.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 29f9f5f2d7f47fe6cc3333f2a9e6c6209db5a8f3)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1857504
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+---
+ virt-xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/virt-xml b/virt-xml
+index 71445c9f..7b0174c9 100755
+--- a/virt-xml
++++ b/virt-xml
+@@ -105,8 +105,8 @@ def get_domain_and_guest(conn, domstr):
+ 
+ def defined_xml_is_unchanged(conn, domain, original_xml):
+     rawxml = get_xmldesc(domain, inactive=True)
+-    new_xml = virtinst.Guest(conn, parsexml=rawxml)
+-    return new_xml != original_xml
++    new_xml = virtinst.Guest(conn, parsexml=rawxml).get_xml()
++    return new_xml == original_xml
+ 
+ 
+ ################
+-- 
+2.26.2
+

SPECS/virt-manager.spec

@@ -18,7 +18,7 @@
 
 Name: virt-manager
 Version: 2.2.1
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}%{?extra_release}
 %global verrel %{version}-%{release}
 
 Summary: Desktop tool for managing virtual machines via libvirt
@@ -38,6 +38,11 @@ Patch7: virt-manager-video-Prefer-bochs-when-it-s-supported.patch
 Patch8: virt-manager-addhardware-Add-bochs-display-to-the-video-list.patch
 Patch9: virt-manager-osdict-Always-return-the-most-generic-tree.patch
 Patch10: virt-manager-osdict-Choose-the-most-appropriate-tree-when-a-profile-is-set.patch
+Patch11: virt-manager-virt-install-Use-minutes-instead-of-seconds-on-get_time_string.patch
+Patch12: virt-manager-details-Fix-showing-the-firmware-type-in-case-of-firmware-auto-selection.patch
+Patch13: virt-manager-details-fix-detection-of-firmware-auto-selection.patch
+Patch14: virt-manager-domain-Fix-VM-deletion-with-firmare-efi.patch
+Patch15: virt-manager-virt-xml-fix-defined_xml_is_unchanged.patch
 
 
 Requires: virt-manager-common = %{verrel}
@@ -225,6 +230,13 @@ done
 
 
 %changelog
+* Mon Nov 23 2020 Pavel Hrdina <phrdina@redhat.com> - 2.2.1-4
+- virt-install: Use minutes instead of seconds on get_time_string() (rhbz#1777664)
+- details: Fix showing the firmware type in case of firmware auto selection (rhbz#1857069)
+- details: fix detection of firmware auto-selection (rhbz#1857069)
+- domain: Fix VM deletion with firmare='efi' (rhbz#1869135)
+- virt-xml: fix defined_xml_is_unchanged (rhbz#1857504)
+
 * Mon Dec  2 2019 Pavel Hrdina <phrdina@redhat.com> - 2.2.1-3
 - guest: Drop set_capabilities_defaults call from get_uefi_path (rhbz#1753644)
 - devices: video: Simplify model hvm check (rhbz#1753644)