From da27da592bc69b1a617c0fb5b58a00921ca2d1d0 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 21 Jan 2022 18:21:50 +0000
Subject: [PATCH] - Upstream bug fixes (bsc#1027942)  
 8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch   Drop
 virtman-init-viewer-on-reboot.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=557
---
 ...lock-console-reconnect-for-non-error.patch | 46 +++++++++++++++++++
 virt-manager.changes                          |  3 ++
 virt-manager.spec                             |  4 +-
 virtman-init-viewer-on-reboot.patch           | 15 ------
 4 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch
 delete mode 100644 virtman-init-viewer-on-reboot.patch

diff --git a/8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch b/8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch
new file mode 100644
index 0000000..531c15f
--- /dev/null
+++ b/8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch
@@ -0,0 +1,46 @@
+Subject: console: Don't block console reconnect for non-error
+From: Cole Robinson crobinso@redhat.com Thu Jan 20 14:14:54 2022 -0500
+Date: Fri Jan 21 11:03:23 2022 -0500:
+Git: 8bb64ad5afd5eb1bb15c25affc5544a3acefe48f
+
+https://listman.redhat.com/archives/virt-tools-list/2022-January/msg00012.html
+
+On xen, a guest reboot will trigger a non-error viewer-disconnected
+signal, but we treat it like an error, which makes it difficult to
+reconnect to the VM console.
+
+If there's no error message raised, treat the disconnect like a
+non-error cases.
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+
+--- a/virtManager/details/console.py
++++ b/virtManager/details/console.py
+@@ -824,14 +824,23 @@ class vmmConsolePages(vmmGObjectUI):
+             return
+ 
+         msg = _("Viewer was disconnected.")
++        errmsg = ""
+         if errdetails:
+-            msg += "\n" + errdetails
++            errmsg += "\n" + errdetails
+         if ssherr:
+             log.debug("SSH tunnel error output: %s", ssherr)
+-            msg += "\n\n"
+-            msg += _("SSH tunnel error output: %s") % ssherr
++            errmsg += "\n\n"
++            errmsg += _("SSH tunnel error output: %s") % ssherr
+ 
+-        self._activate_gfx_unavailable_page(msg)
++        if errmsg:
++            self._activate_gfx_unavailable_page(msg + errmsg)
++            return
++
++        # If no error message was reported, this isn't a clear graphics
++        # error that should block reconnecting. So use the top level
++        # 'VM unavailable' page which makes it easier for the user to
++        # reconnect.
++        self._activate_vm_unavailable_page(msg)
+ 
+     def _viewer_disconnected(self, ignore, errdetails, ssherr):
+         self._activate_gfx_unavailable_page(_("Viewer disconnected."))
diff --git a/virt-manager.changes b/virt-manager.changes
index acc840b..128e646 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -4,6 +4,9 @@ Thu Jan 20 15:46:02 MST 2022 - carnold@suse.com
 - bsc#1194323 - [jsc#SLE-19237][virt-manager] Detected the wrong
   win2k22 guest system version from the local install media
   virtinst-windows-server-detection.patch
+- Upstream bug fixes (bsc#1027942)
+  8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch
+  Drop virtman-init-viewer-on-reboot.patch
 
 -------------------------------------------------------------------
 Thu Jan 13 13:33:50 MST 2022 - carnold@suse.com
diff --git a/virt-manager.spec b/virt-manager.spec
index e26f04f..365eb6e 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -44,6 +44,7 @@ Patch9:         9363e1e6-virt-xml-add-support-for-mediated-devices.patch
 Patch10:        f87e96d3-hostdev-use-method-get_mdev_uuid.patch
 Patch11:        9d4002ee-tests-verify-MDEV-support.patch
 Patch12:        0e15cd51-virt-manager-enable-MDEV-support.patch
+Patch13:        8bb64ad5-console-Dont-block-console-reconnect-for-non-error.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -79,7 +80,6 @@ Patch158:       virtman-disallow-adding-floppy-disk.patch
 Patch159:       virtman-register-delete-event-for-details-dialog.patch
 Patch160:       virtman-show-no-firmware-for-xenpv.patch
 Patch161:       virtman-legacy-bios-support.patch
-Patch162:       virtman-init-viewer-on-reboot.patch
 Patch170:       virtinst-xen-drive-type.patch
 Patch171:       virtinst-xenbus-disk-index-fix.patch
 Patch172:       virtinst-refresh_before_fetch_pool.patch
@@ -185,6 +185,7 @@ machine).
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1
@@ -220,7 +221,6 @@ machine).
 %patch159 -p1
 %patch160 -p1
 %patch161 -p1
-%patch162 -p1
 %patch170 -p1
 %patch171 -p1
 %patch172 -p1
diff --git a/virtman-init-viewer-on-reboot.patch b/virtman-init-viewer-on-reboot.patch
deleted file mode 100644
index f274d72..0000000
--- a/virtman-init-viewer-on-reboot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-References: bsc#1191358
-
-Index: virt-manager-3.2.0/virtManager/details/console.py
-===================================================================
---- virt-manager-3.2.0.orig/virtManager/details/console.py
-+++ virt-manager-3.2.0/virtManager/details/console.py
-@@ -923,6 +923,8 @@ class vmmConsolePages(vmmGObjectUI):
-             return
- 
-         cpage = self.widget("console-pages").get_current_page()
-+        if cpage == _CONSOLE_PAGE_GRAPHICS:
-+            self._init_viewer()
-         if cpage != _CONSOLE_PAGE_UNAVAILABLE:
-             return
-